Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-confused-revert.out @ 1449:30146be3437c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add test-confused-revert, fix permissions on test-revert
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Oct 2005 15:54:44 -0700
parents
children d436b21b20dc
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-confused-revert.out
@@ -0,0 +1,17 @@
+%%% should show a removed and b added
+A b
+R a
+reverting...
+%%% should show b unknown and a back to normal
+? b
+merging a
+%%% should show foo-b
+foo-b
+%%% should show a removed and b added
+A b
+R a
+reverting...
+%%% should show b unknown and a marked modified (merged)
+? b
+%%% should show foo-b
+foo-b