Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-confused-revert.out @ 2042:a514c7509fa9
small changes to revert command.
fix bug 93: work with files that are in target manifest but not
dirstate.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 03 Apr 2006 10:02:09 -0700 |
parents | c9226bcc288d |
children | 968f036f93a4 |
comparison
equal
deleted
inserted
replaced
2041:077a2da7f1de | 2042:a514c7509fa9 |
---|---|
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 undeleting a | |
5 forgetting b | 6 forgetting b |
6 undeleting a | |
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 | 9 ? b.orig |
10 merging a | 10 merging a |
11 %%% should show foo-b | 11 %%% should show foo-b |
13 %%% should show a removed and b added | 13 %%% should show a removed and b added |
14 A b | 14 A b |
15 R a | 15 R a |
16 ? b.orig | 16 ? b.orig |
17 reverting... | 17 reverting... |
18 undeleting a | |
18 forgetting b | 19 forgetting b |
19 undeleting a | |
20 %%% should show b unknown and a marked modified (merged) | 20 %%% should show b unknown and a marked modified (merged) |
21 ? b | 21 ? b |
22 ? b.orig | 22 ? b.orig |
23 %%% should show foo-b | 23 %%% should show foo-b |
24 foo-b | 24 foo-b |