Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-confused-revert.out @ 2043:968f036f93a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor fix for revert: No need to make a backup when forgetting added files. echo foo > foo && hg add foo && hg revert foo creates foo.orig, though foo is not changed or deleted.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Apr 2006 21:01:33 +0200
parents a514c7509fa9
children b2ae81a7df29
comparison
equal deleted inserted replaced
2042:a514c7509fa9 2043:968f036f93a4
4 reverting... 4 reverting...
5 undeleting a 5 undeleting a
6 forgetting b 6 forgetting b
7 %%% should show b unknown and a back to normal 7 %%% should show b unknown and a back to normal
8 ? b 8 ? b
9 ? b.orig
10 merging a 9 merging a
11 %%% should show foo-b 10 %%% should show foo-b
12 foo-b 11 foo-b
13 %%% should show a removed and b added 12 %%% should show a removed and b added
14 A b 13 A b
15 R a 14 R a
16 ? b.orig
17 reverting... 15 reverting...
18 undeleting a 16 undeleting a
19 forgetting b 17 forgetting b
20 %%% should show b unknown and a marked modified (merged) 18 %%% should show b unknown and a marked modified (merged)
21 ? b 19 ? b
22 ? b.orig
23 %%% should show foo-b 20 %%% should show foo-b
24 foo-b 21 foo-b