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