Show More
@@ -2,24 +2,24 | |||
|
2 | 2 | A b |
|
3 | 3 | R a |
|
4 | 4 | reverting... |
|
5 |
saving current version of b as b. |
|
|
5 | saving current version of b as b.orig | |
|
6 | 6 | forgetting b |
|
7 | 7 | undeleting a |
|
8 | 8 | %%% should show b unknown and a back to normal |
|
9 | 9 | ? b |
|
10 | ? b.bak | |
|
10 | ? b.orig | |
|
11 | 11 | merging a |
|
12 | 12 | %%% should show foo-b |
|
13 | 13 | foo-b |
|
14 | 14 | %%% should show a removed and b added |
|
15 | 15 | A b |
|
16 | 16 | R a |
|
17 | ? b.bak | |
|
17 | ? b.orig | |
|
18 | 18 | reverting... |
|
19 | 19 | forgetting b |
|
20 | 20 | undeleting a |
|
21 | 21 | %%% should show b unknown and a marked modified (merged) |
|
22 | 22 | ? b |
|
23 | ? b.bak | |
|
23 | ? b.orig | |
|
24 | 24 | %%% should show foo-b |
|
25 | 25 | foo-b |
@@ -3,18 +3,18 0:eb43f19ff115 | |||
|
3 | 3 | 016807e6fdaf tip |
|
4 | 4 | eb43f19ff115 |
|
5 | 5 | eb43f19ff115+ |
|
6 |
saving current version of file1 as file1. |
|
|
6 | saving current version of file1 as file1.orig | |
|
7 | 7 | reverting file1 |
|
8 |
? file1. |
|
|
8 | ? file1.orig | |
|
9 | 9 | eb43f19ff115 |
|
10 |
? file1. |
|
|
10 | ? file1.orig | |
|
11 | 11 | 016807e6fdaf tip |
|
12 | 12 | merging file1 |
|
13 |
? file1. |
|
|
13 | ? file1.orig | |
|
14 | 14 | 016807e6fdaf tip |
|
15 |
? file1. |
|
|
15 | ? file1.orig | |
|
16 | 16 | 016807e6fdaf tip |
|
17 |
? file1. |
|
|
17 | ? file1.orig | |
|
18 | 18 | 016807e6fdaf tip |
|
19 |
? file1. |
|
|
19 | ? file1.orig | |
|
20 | 20 | 016807e6fdaf tip |
@@ -13,18 +13,18 R a | |||
|
13 | 13 | %% should show b added, copy saved, and c modified |
|
14 | 14 | M c |
|
15 | 15 | A b |
|
16 |
saving current version of b as b. |
|
|
16 | saving current version of b as b.orig | |
|
17 | 17 | %% should show b unknown, b.bak unknown, and c modified |
|
18 | 18 | M c |
|
19 | 19 | ? b |
|
20 | ? b.bak | |
|
20 | ? b.orig | |
|
21 | 21 | %% should show unknown: b b.bak |
|
22 | 22 | ? b |
|
23 | ? b.bak | |
|
23 | ? b.orig | |
|
24 | 24 | %% should show a b b.bak c e |
|
25 | 25 | a |
|
26 | 26 | b |
|
27 | b.bak | |
|
27 | b.orig | |
|
28 | 28 | c |
|
29 | 29 | e |
|
30 | 30 | %% should save backup to e.0 |
@@ -21,7 +21,7 failed | |||
|
21 | 21 | use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead |
|
22 | 22 | abort: use only one form to specify the revision |
|
23 | 23 | failed |
|
24 |
saving current version of .hgtags as .hgtags. |
|
|
24 | saving current version of .hgtags as .hgtags.orig | |
|
25 | 25 | use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead |
|
26 | 26 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah |
|
27 | 27 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0 |
General Comments 0
You need to be logged in to leave comments.
Login now