Mercurial > hg

diff tests/test-up-local-change.out @ 6283:5a45c82fc7da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert cfebb175704f, fixing the output of 2 tests
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 15 Mar 2008 22:03:18 -0300
parents c50ac875ffcb
children 4b0c9c674707
line wrap: on
line diff
--- a/tests/test-up-local-change.out	Sat Mar 15 22:03:18 2008 -0300
+++ b/tests/test-up-local-change.out	Sat Mar 15 22:03:18 2008 -0300
@@ -17,7 +17,7 @@
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
-  searching for copies back to rev 0
+  searching for copies back to rev 1
   unmatched files in other:
    b
  a: versions differ -> m
@@ -54,7 +54,7 @@
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
-  searching for copies back to rev 0
+  searching for copies back to rev 1
   unmatched files in other:
    b
  a: versions differ -> m