diff options
Diffstat (limited to 'tests/test-backout.t')
| -rw-r--r-- | tests/test-backout.t | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/test-backout.t b/tests/test-backout.t index c2404f5..7e47659 100644 --- a/tests/test-backout.t +++ b/tests/test-backout.t @@ -48,8 +48,8 @@ backout of backout is as if nothing happened $ hg backout -d '3 0' --merge tip --tool=true removing a changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d - $ test -f a - [1] + $ cat a 2>/dev/null || echo cat: a: No such file or directory + cat: a: No such file or directory across branch @@ -117,8 +117,6 @@ check line 1 is back line 2 line 3 - $ cd .. - backout should not back out subsequent changesets $ hg init onecs @@ -184,7 +182,7 @@ with --merge backout of merge should fail $ hg backout 4 - abort: cannot backout a merge changeset + abort: cannot backout a merge changeset without --parent [255] backout of merge with bad parent should fail @@ -227,13 +225,11 @@ named branches adding default $ hg branch branch1 marked working directory as branch branch1 - (branches are permanent and global, did you want a bookmark?) $ echo branch1 > file1 $ hg ci -d '1 0' -Am file1 adding file1 $ hg branch branch2 marked working directory as branch branch2 - (branches are permanent and global, did you want a bookmark?) $ echo branch2 > file2 $ hg ci -d '2 0' -Am file2 adding file2 @@ -290,5 +286,3 @@ on branch1, so no file1 and file2: $ hg st -A C default C file1 - - $ cd .. |