From 57fe9181f58d6a311dd105283eff2be055de26b6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 25 Sep 2016 19:24:33 +0100 Subject: Fix spelling of "pseudo" Signed-off-by: Ian Jackson --- TODO.BRANCH | 2 +- dgit | 2 +- dgit.7 | 2 +- tests/tests/quilt-gbp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TODO.BRANCH b/TODO.BRANCH index 81872b3..a8f5deb 100644 --- a/TODO.BRANCH +++ b/TODO.BRANCH @@ -5,7 +5,7 @@ We want a --overwrite=VERSION option which 1. adjusts the version used above, and 2. does the same thing in any - quilt mode. If no split brain it should make the psuedomerge + quilt mode. If no split brain it should make the pseudomerge on the user's HEAD. diff --git a/dgit b/dgit index b1cb9b2..ff5f554 100755 --- a/dgit +++ b/dgit @@ -1896,7 +1896,7 @@ sub fetch_from_archive () { # Finally: we do not necessarily reify the public view (as # described above). This is so that we do not end up stacking two # pseudo-merges. So what we actually do is figure out the inputs - # to any public view psuedo-merge and put them in @mergeinputs. + # to any public view pseudo-merge and put them in @mergeinputs. my @mergeinputs; # $mergeinputs[]{Commit} diff --git a/dgit.7 b/dgit.7 index d57cff7..cbf91b9 100644 --- a/dgit.7 +++ b/dgit.7 @@ -49,7 +49,7 @@ branch) whose tree is identical to the unpacked source upload. Uploads not made by dgit are represented in git by commits which are synthesised by dgit. The tree of each such commit corresponds to the unpacked source; there is an origin commit with the contents, and a -psuedo-merge from last known upload - that is, from the contents of +pseudo-merge from last known upload - that is, from the contents of the dgit/suite branch. dgit expects repos that it works with to have a diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index 2dc9b42..e091165 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -42,7 +42,7 @@ echo wombat >>debian/pointless-for-dgit-test git add debian/pointless-for-dgit-test git commit -m 'Pointless 2' -t-commit 'Check psuedomerge' 1.0-3 +t-commit 'Check pseudomerge' 1.0-3 t-dgit --quilt=gbp --clean=git build-source -- cgit v1.2.3