Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-confused-revert.out @ 2214:6c6c0e5595a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make test-confused-revert check working dir with two parents.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 05 May 2006 10:45:08 -0700
parents b2ae81a7df29
children 25857e00af8e
comparison
equal deleted inserted replaced
2213:6f76a479ae51 2214:6c6c0e5595a2
14 %%% should show foo-b 14 %%% should show foo-b
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 reverting... 19 %%% revert should fail
20 abort: working dir has two parents; you must specify the revision to revert to
21 %%% revert should be ok now
20 undeleting a 22 undeleting a
21 forgetting b 23 forgetting b
22 %%% should show b unknown and a marked modified (merged) 24 %%% should show b unknown and a marked modified (merged)
23 ? b 25 ? b
24 %%% should show foo-b 26 %%% should show foo-b