diff options
Diffstat (limited to 'tests/test-add.t')
| -rw-r--r-- | tests/test-add.t | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/test-add.t b/tests/test-add.t index 85a9b4e..d0eeca7 100644 --- a/tests/test-add.t +++ b/tests/test-add.t @@ -33,7 +33,6 @@ should fail A a A b -#if no-windows $ echo foo > con.xml $ hg --config ui.portablefilenames=jump add con.xml abort: ui.portablefilenames value is invalid ('jump') @@ -51,11 +50,6 @@ should fail A a A b A con.xml - $ hg forget con.xml - $ rm con.xml -#endif - -#if eol-in-paths $ echo bla > 'hello:world' $ hg --config ui.portablefilenames=abort add adding hello:world @@ -64,14 +58,15 @@ should fail $ hg st A a A b + A con.xml ? hello:world $ hg --config ui.portablefilenames=ignore add adding hello:world $ hg st A a A b + A con.xml A hello:world -#endif $ hg ci -m 0 --traceback @@ -91,7 +86,7 @@ should fail $ hg merge merging a warning: conflicts during merge. - merging a incomplete! (edit conflicts, then use 'hg resolve --mark') + merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] @@ -126,15 +121,14 @@ Issue683: peculiarity with hg revert of an removed then added file ? a.orig $ hg add c && echo "unexpected addition of missing file" - c: * (glob) + c: No such file or directory [1] $ echo c > c $ hg add d c && echo "unexpected addition of missing file" - d: * (glob) + d: No such file or directory [1] $ hg st M a A c ? a.orig - $ cd .. |