Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-confused-revert.out @ 2029:d436b21b20dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewrite revert command. fix issues 93, 123, 147. new version does these things: - saves backup copies of modified files (issue 147) - prints output like other commands, and errors when files not found (issue 123) - marks files added/removed (issue 93)
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 31 Mar 2006 10:37:25 -0800
parents 30146be3437c
children 8d9ec30d58bc
comparison
equal deleted inserted replaced
2028:1f1fc418a96c 2029:d436b21b20dc
1 %%% should show a removed and b added 1 %%% should show a removed and b added
2 A b 2 A b
3 R a 3 R a
4 reverting... 4 reverting...
5 saving current version of b as b.bak
6 forgetting b
7 undeleting a
5 %%% should show b unknown and a back to normal 8 %%% should show b unknown and a back to normal
6 ? b 9 ? b
10 ? b.bak
7 merging a 11 merging a
8 %%% should show foo-b 12 %%% should show foo-b
9 foo-b 13 foo-b
10 %%% should show a removed and b added 14 %%% should show a removed and b added
11 A b 15 A b
12 R a 16 R a
17 ? b.bak
13 reverting... 18 reverting...
19 forgetting b
20 undeleting a
14 %%% should show b unknown and a marked modified (merged) 21 %%% should show b unknown and a marked modified (merged)
15 ? b 22 ? b
23 ? b.bak
16 %%% should show foo-b 24 %%% should show foo-b
17 foo-b 25 foo-b