# HG changeset patch # User Vadim Gelfer # Date 2006-03-31 18:52:56 # Node ID 8d9ec30d58bc79bfa3a4a11a006abb11deb65473 # Parent d436b21b20dc0d14220fcad07b154994f5e55e27 forgot to rerun tests after changed backup extension to .orig. thomas a.h. found this. diff --git a/tests/test-confused-revert.out b/tests/test-confused-revert.out --- a/tests/test-confused-revert.out +++ b/tests/test-confused-revert.out @@ -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 diff --git a/tests/test-merge-revert.out b/tests/test-merge-revert.out --- a/tests/test-merge-revert.out +++ b/tests/test-merge-revert.out @@ -3,18 +3,18 @@ 0:eb43f19ff115 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 diff --git a/tests/test-revert.out b/tests/test-revert.out --- a/tests/test-revert.out +++ b/tests/test-revert.out @@ -13,18 +13,18 @@ R a %% 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 diff --git a/tests/test-tag.out b/tests/test-tag.out --- a/tests/test-tag.out +++ b/tests/test-tag.out @@ -21,7 +21,7 @@ failed 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