forgot to rerun tests after changed backup extension to .orig.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Fri, 31 Mar 2006 10:52:56 -0800
changeset 2030 8d9ec30d58bc
parent 2029 d436b21b20dc
child 2031 d242719c716e
child 2036 c9226bcc288d
child 2061 5987c1eac2ce
forgot to rerun tests after changed backup extension to .orig. thomas a.h. found this.
tests/test-confused-revert.out
tests/test-merge-revert.out
tests/test-revert.out
tests/test-tag.out
--- a/tests/test-confused-revert.out	Fri Mar 31 10:37:25 2006 -0800
+++ b/tests/test-confused-revert.out	Fri Mar 31 10:52:56 2006 -0800
@@ -2,24 +2,24 @@
 A b
 R a
 reverting...
-saving current version of b as b.bak
+saving current version of b as b.orig
 forgetting b
 undeleting a
 %%% should show b unknown and a back to normal
 ? b
-? b.bak
+? b.orig
 merging a
 %%% should show foo-b
 foo-b
 %%% should show a removed and b added
 A b
 R a
-? b.bak
+? b.orig
 reverting...
 forgetting b
 undeleting a
 %%% should show b unknown and a marked modified (merged)
 ? b
-? b.bak
+? b.orig
 %%% should show foo-b
 foo-b
--- a/tests/test-merge-revert.out	Fri Mar 31 10:37:25 2006 -0800
+++ b/tests/test-merge-revert.out	Fri Mar 31 10:52:56 2006 -0800
@@ -3,18 +3,18 @@
 016807e6fdaf tip
 eb43f19ff115
 eb43f19ff115+
-saving current version of file1 as file1.bak
+saving current version of file1 as file1.orig
 reverting file1
-? file1.bak
+? file1.orig
 eb43f19ff115
-? file1.bak
+? file1.orig
 016807e6fdaf tip
 merging file1
-? file1.bak
+? file1.orig
 016807e6fdaf tip
-? file1.bak
+? file1.orig
 016807e6fdaf tip
-? file1.bak
+? file1.orig
 016807e6fdaf tip
-? file1.bak
+? file1.orig
 016807e6fdaf tip
--- a/tests/test-revert.out	Fri Mar 31 10:37:25 2006 -0800
+++ b/tests/test-revert.out	Fri Mar 31 10:52:56 2006 -0800
@@ -13,18 +13,18 @@
 %% should show b added, copy saved, and c modified
 M c
 A b
-saving current version of b as b.bak
+saving current version of b as b.orig
 %% should show b unknown, b.bak unknown, and c modified
 M c
 ? b
-? b.bak
+? b.orig
 %% should show unknown: b b.bak
 ? b
-? b.bak
+? b.orig
 %% should show a b b.bak c e
 a
 b
-b.bak
+b.orig
 c
 e
 %% should save backup to e.0
--- a/tests/test-tag.out	Fri Mar 31 10:37:25 2006 -0800
+++ b/tests/test-tag.out	Fri Mar 31 10:52:56 2006 -0800
@@ -21,7 +21,7 @@
 use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
 abort: use only one form to specify the revision
 failed
-saving current version of .hgtags as .hgtags.bak
+saving current version of .hgtags as .hgtags.orig
 use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah
 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0