Show More
@@ -2389,7 +2389,7 b' def revert(ui, repo, *pats, **opts):' | |||||
2389 | # make backup if in target manifest |
|
2389 | # make backup if in target manifest | |
2390 | # make backup if not in target manifest |
|
2390 | # make backup if not in target manifest | |
2391 | (modified, revert, remove, True, True), |
|
2391 | (modified, revert, remove, True, True), | |
2392 |
(added, revert, forget, True, |
|
2392 | (added, revert, forget, True, False), | |
2393 | (removed, undelete, None, False, False), |
|
2393 | (removed, undelete, None, False, False), | |
2394 | (deleted, revert, remove, False, False), |
|
2394 | (deleted, revert, remove, False, False), | |
2395 | (unknown, add, None, True, False), |
|
2395 | (unknown, add, None, True, False), |
@@ -6,19 +6,16 b' 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 |
@@ -22,12 +22,12 b' hg revert a' | |||||
22 | echo %% should show b added, copy saved, and c modified |
|
22 | echo %% should show b added, copy saved, and c modified | |
23 | hg status |
|
23 | hg status | |
24 | hg revert b |
|
24 | hg revert b | |
25 |
echo %% should show b unknown, |
|
25 | echo %% should show b unknown, and c modified | |
26 | hg status |
|
26 | hg status | |
27 | hg revert --no-backup c |
|
27 | hg revert --no-backup c | |
28 |
echo %% should show unknown: b |
|
28 | echo %% should show unknown: b | |
29 | hg status |
|
29 | hg status | |
30 |
echo %% should show a b |
|
30 | echo %% should show a b c e | |
31 | ls |
|
31 | ls | |
32 | echo %% should verbosely save backup to e.orig |
|
32 | echo %% should verbosely save backup to e.orig | |
33 | echo z > e |
|
33 | echo z > e |
@@ -13,17 +13,14 b' R a' | |||||
13 | %% should show b added, copy saved, and c modified |
|
13 | %% should show b added, copy saved, and c modified | |
14 | M c |
|
14 | M c | |
15 | A b |
|
15 | A b | |
16 |
%% should show b unknown, |
|
16 | %% should show b unknown, and c modified | |
17 | M c |
|
17 | M c | |
18 | ? b |
|
18 | ? b | |
19 | ? b.orig |
|
19 | %% should show unknown: b | |
20 | %% should show unknown: b b.orig |
|
|||
21 | ? b |
|
20 | ? b | |
22 | ? b.orig |
|
21 | %% should show a b c e | |
23 | %% should show a b b.orig c e |
|
|||
24 | a |
|
22 | a | |
25 | b |
|
23 | b | |
26 | b.orig |
|
|||
27 | c |
|
24 | c | |
28 | e |
|
25 | e | |
29 | %% should verbosely save backup to e.orig |
|
26 | %% should verbosely save backup to e.orig | |
@@ -40,7 +37,6 b' file not managed: q' | |||||
40 | notfound: No such file in rev 095eacd0c0d7 |
|
37 | notfound: No such file in rev 095eacd0c0d7 | |
41 | A z |
|
38 | A z | |
42 | ? b |
|
39 | ? b | |
43 | ? b.orig |
|
|||
44 | ? e.orig |
|
40 | ? e.orig | |
45 | %% should add a, forget z |
|
41 | %% should add a, forget z | |
46 | adding a |
|
42 | adding a |
General Comments 0
You need to be logged in to leave comments.
Login now