diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-merge1.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-merge1.t')
| -rw-r--r-- | tests/test-merge1.t | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/test-merge1.t b/tests/test-merge1.t index e0303c9..dfebd5b 100644 --- a/tests/test-merge1.t +++ b/tests/test-merge1.t @@ -66,8 +66,7 @@ no merges expected $ echo This is file b2 > b merge should fail $ hg merge 1 - b: untracked file differs - abort: untracked files in working directory differ from files in requested revision + abort: untracked file in working directory differs from file in requested revision: 'b' [255] merge of b expected $ hg merge -f 1 @@ -109,10 +108,10 @@ Contents of b should be "this is file b1" $ echo This is file b22 > b merge fails $ hg merge 2 - abort: outstanding uncommitted changes - (use 'hg status' to list changes) + abort: outstanding uncommitted changes (use 'hg status' to list changes) [255] -merge expected! + $ echo %% merge expected! + %% merge expected! $ hg merge -f 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -146,8 +145,7 @@ merge expected! $ echo This is file b33 > b merge of b should fail $ hg merge 2 - abort: outstanding uncommitted changes - (use 'hg status' to list changes) + abort: outstanding uncommitted changes (use 'hg status' to list changes) [255] merge of b expected $ hg merge -f 2 @@ -172,5 +170,3 @@ Test for issue2364 $ hg ci -md $ hg revert -r -2 b $ hg up -q -- -2 - - $ cd .. |