Mercurial > hg

comparison tests/test-confused-revert.out @ 3099:09e8aecd8016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with backout
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Sep 2006 16:01:16 -0500
parents 25857e00af8e
children 53cbb33e1269
comparison
equal deleted inserted replaced
3098:c27d1e1798a3 3099:09e8aecd8016
15 foo-b 15 foo-b
16 %%% should show a removed and b added 16 %%% should show a removed and b added
17 A b 17 A b
18 R a 18 R a
19 %%% revert should fail 19 %%% revert should fail
20 abort: working dir has two parents; you must specify the revision to revert to 20 abort: uncommitted merge - please provide a specific revision
21 %%% revert should be ok now 21 %%% revert should be ok now
22 undeleting a 22 undeleting a
23 forgetting b 23 forgetting b
24 %%% should show b unknown and a marked modified (merged) 24 %%% should show b unknown and a marked modified (merged)
25 ? b 25 ? b