Mercurial > hg

diff tests/test-issue522.out @ 8753:af5f099d932b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: refactor manifestmerge init to better report effective ancestor
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents e7ed5d07cc4c
children ba5e508b5e92
line wrap: on
line diff
--- a/tests/test-issue522.out	Mon Jun 08 18:14:44 2009 -0500
+++ b/tests/test-issue522.out	Mon Jun 08 18:14:44 2009 -0500
@@ -1,12 +1,12 @@
 reverting foo
 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  searching for copies back to rev 1
+  unmatched files in local:
+   bar
 resolving manifests
  overwrite None partial False
  ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
-  searching for copies back to rev 1
-  unmatched files in local:
-   bar
  foo: remote is newer -> g
 getting foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved