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

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 7544700fd931
children 8d9ec30d58bc
line wrap: on
line diff
--- a/tests/test-merge-revert.out	Fri Mar 31 03:25:35 2006 -0600
+++ b/tests/test-merge-revert.out	Fri Mar 31 10:37:25 2006 -0800
@@ -3,10 +3,18 @@
 016807e6fdaf tip
 eb43f19ff115
 eb43f19ff115+
+saving current version of file1 as file1.bak
+reverting file1
+? file1.bak
 eb43f19ff115
+? file1.bak
 016807e6fdaf tip
 merging file1
+? file1.bak
 016807e6fdaf tip
+? file1.bak
 016807e6fdaf tip
+? file1.bak
 016807e6fdaf tip
+? file1.bak
 016807e6fdaf tip