##// END OF EJS Templates
Minor fix for revert: No need to make a backup when forgetting added files....
Thomas Arendsen Hein -
r2043:968f036f default
parent child Browse files
Show More
@@ -2389,7 +2389,7 b' def revert(ui, repo, *pats, **opts):'
2389 2389 # make backup if in target manifest
2390 2390 # make backup if not in target manifest
2391 2391 (modified, revert, remove, True, True),
2392 (added, revert, forget, True, True),
2392 (added, revert, forget, True, False),
2393 2393 (removed, undelete, None, False, False),
2394 2394 (deleted, revert, remove, False, False),
2395 2395 (unknown, add, None, True, False),
@@ -6,19 +6,16 b' undeleting a'
6 6 forgetting b
7 7 %%% should show b unknown and a back to normal
8 8 ? b
9 ? b.orig
10 9 merging a
11 10 %%% should show foo-b
12 11 foo-b
13 12 %%% should show a removed and b added
14 13 A b
15 14 R a
16 ? b.orig
17 15 reverting...
18 16 undeleting a
19 17 forgetting b
20 18 %%% should show b unknown and a marked modified (merged)
21 19 ? b
22 ? b.orig
23 20 %%% should show foo-b
24 21 foo-b
@@ -22,12 +22,12 b' hg revert a'
22 22 echo %% should show b added, copy saved, and c modified
23 23 hg status
24 24 hg revert b
25 echo %% should show b unknown, b.orig unknown, and c modified
25 echo %% should show b unknown, and c modified
26 26 hg status
27 27 hg revert --no-backup c
28 echo %% should show unknown: b b.orig
28 echo %% should show unknown: b
29 29 hg status
30 echo %% should show a b b.orig c e
30 echo %% should show a b c e
31 31 ls
32 32 echo %% should verbosely save backup to e.orig
33 33 echo z > e
@@ -13,17 +13,14 b' R a'
13 13 %% should show b added, copy saved, and c modified
14 14 M c
15 15 A b
16 %% should show b unknown, b.orig unknown, and c modified
16 %% should show b unknown, and c modified
17 17 M c
18 18 ? b
19 ? b.orig
20 %% should show unknown: b b.orig
19 %% should show unknown: b
21 20 ? b
22 ? b.orig
23 %% should show a b b.orig c e
21 %% should show a b c e
24 22 a
25 23 b
26 b.orig
27 24 c
28 25 e
29 26 %% should verbosely save backup to e.orig
@@ -40,7 +37,6 b' file not managed: q'
40 37 notfound: No such file in rev 095eacd0c0d7
41 38 A z
42 39 ? b
43 ? b.orig
44 40 ? e.orig
45 41 %% should add a, forget z
46 42 adding a
General Comments 0
You need to be logged in to leave comments. Login now