Mercurial > hg-stable
changeset 17492:973c2b0b403c
spelling: nonexistent
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 17 Aug 2012 13:58:18 -0700 |
| parents | fd28974f6f66 |
| children | d057e92dadfc |
| files | tests/test-copy.t tests/test-hook.t tests/test-merge-tools.t tests/test-mq-qimport.t tests/test-mq-qrefresh.t tests/test-qrecord.t tests/test-rename.t tests/test-symlinks.t |
| diffstat | 8 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-copy.t Fri Aug 17 13:58:18 2012 -0700 +++ b/tests/test-copy.t Fri Aug 17 13:58:18 2012 -0700 @@ -139,7 +139,7 @@ foo3 does not exist! $ hg up -qC . -copy --after to a nonexistant target filename +copy --after to a nonexistent target filename $ hg cp -A foo dummy foo: not recording copy - dummy does not exist
--- a/tests/test-hook.t Fri Aug 17 13:58:18 2012 -0700 +++ b/tests/test-hook.t Fri Aug 17 13:58:18 2012 -0700 @@ -529,12 +529,12 @@ [1] $ echo '[hooks]' > .hg/hgrc - $ echo "update.ne = python:`pwd`/nonexisting.py:testhook" >> .hg/hgrc + $ echo "update.ne = python:`pwd`/nonexistent.py:testhook" >> .hg/hgrc $ echo "pre-identify.npmd = python:`pwd`/:no_python_module_dir" >> .hg/hgrc $ hg up null loading update.ne hook failed: - abort: No such file or directory: $TESTTMP/d/repo/nonexisting.py + abort: No such file or directory: $TESTTMP/d/repo/nonexistent.py [255] $ hg id
--- a/tests/test-merge-tools.t Fri Aug 17 13:58:18 2012 -0700 +++ b/tests/test-merge-tools.t Fri Aug 17 13:58:18 2012 -0700 @@ -191,7 +191,7 @@ false.whatever= true.priority=1 # hg update -C 1 - $ hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool + $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -212,7 +212,7 @@ false.whatever= true.priority=1 # hg update -C 1 - $ hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool + $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -336,7 +336,7 @@ true.priority=1 true.executable=cat # hg update -C 1 - $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool + $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool couldn't find merge tool true specified for f merging f merging f failed! @@ -359,7 +359,7 @@ true.priority=1 true.executable=cat # hg update -C 1 - $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool + $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool couldn't find merge tool true specified for f merging f merging f failed!
--- a/tests/test-mq-qimport.t Fri Aug 17 13:58:18 2012 -0700 +++ b/tests/test-mq-qimport.t Fri Aug 17 13:58:18 2012 -0700 @@ -240,7 +240,7 @@ qimport with bad name, should abort before reading file - $ hg qimport non-existant-file --name .hg + $ hg qimport non-existent-file --name .hg abort: patch name cannot begin with ".hg" [255]
--- a/tests/test-mq-qrefresh.t Fri Aug 17 13:58:18 2012 -0700 +++ b/tests/test-mq-qrefresh.t Fri Aug 17 13:58:18 2012 -0700 @@ -207,7 +207,7 @@ $ echo 'orphan' > orphanchild $ hg add orphanchild - $ hg qrefresh nonexistingfilename # clear patch + $ hg qrefresh nonexistentfilename # clear patch $ hg qrefresh --short 1/base $ hg qrefresh --short 2/base
--- a/tests/test-qrecord.t Fri Aug 17 13:58:18 2012 -0700 +++ b/tests/test-qrecord.t Fri Aug 17 13:58:18 2012 -0700 @@ -108,9 +108,9 @@ help (bad mq) - $ echo "mq=nonexistant" >> $HGRCPATH + $ echo "mq=nonexistent" >> $HGRCPATH $ hg help qrecord - *** failed to import extension mq from nonexistant: [Errno 2] * (glob) + *** failed to import extension mq from nonexistent: [Errno 2] * (glob) hg qrecord [OPTION]... PATCH [FILE]... interactively record a new patch @@ -121,7 +121,7 @@ help (mq present) - $ sed 's/mq=nonexistant/mq=/' $HGRCPATH > hgrc.tmp + $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp $ mv hgrc.tmp $HGRCPATH $ hg help qrecord
--- a/tests/test-rename.t Fri Aug 17 13:58:18 2012 -0700 +++ b/tests/test-rename.t Fri Aug 17 13:58:18 2012 -0700 @@ -66,7 +66,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm d2/c -rename --after a single file to a nonexistant target filename +rename --after a single file to a nonexistent target filename $ hg rename --after d1/a dummy d1/a: not recording move - dummy does not exist (glob)