Mercurial > hg-stable
diff tests/test-up-local-change.out @ 5371:17ed9b9a0d03
merge: add debug diagnostics for findcopies
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 04 Oct 2007 19:44:37 -0500 |
| parents | fffc8a733bf9 |
| children | 3d1f9dcecdea |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Wed Oct 03 17:17:28 2007 -0500 +++ b/tests/test-up-local-change.out Thu Oct 04 19:44:37 2007 -0500 @@ -17,6 +17,9 @@ resolving manifests overwrite False partial False ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 + searching for copies back to rev 1 + unmatched files in other: + b a: versions differ -> m b: remote created -> g merging a @@ -50,6 +53,9 @@ resolving manifests overwrite False partial False ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 + searching for copies back to rev 1 + unmatched files in other: + b a: versions differ -> m b: remote created -> g merging a @@ -100,6 +106,7 @@ resolving manifests overwrite False partial False ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d + searching for copies back to rev 1 a: versions differ -> m b: versions differ -> m merging a