Mercurial > hg > pyhgsh

diff tests/test-confused-revert.out @ 2029:d436b21b20dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewrite revert command. fix issues 93, 123, 147. new version does these things: - saves backup copies of modified files (issue 147) - prints output like other commands, and errors when files not found (issue 123) - marks files added/removed (issue 93)
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 31 Mar 2006 10:37:25 -0800
parents 30146be3437c
children 8d9ec30d58bc
line wrap: on
line diff
--- a/tests/test-confused-revert.out	Fri Mar 31 03:25:35 2006 -0600
+++ b/tests/test-confused-revert.out	Fri Mar 31 10:37:25 2006 -0800
@@ -2,16 +2,24 @@
 A b
 R a
 reverting...
+saving current version of b as b.bak
+forgetting b
+undeleting a
 %%% should show b unknown and a back to normal
 ? b
+? b.bak
 merging a
 %%% should show foo-b
 foo-b
 %%% should show a removed and b added
 A b
 R a
+? b.bak
 reverting...
+forgetting b
+undeleting a
 %%% should show b unknown and a marked modified (merged)
 ? b
+? b.bak
 %%% should show foo-b
 foo-b