Mercurial > hg
diff tests/test-issue672.out @ 8753:af5f099d932b
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 | f325574dad1a |
children | ba5e508b5e92 |
line wrap: on
line diff
--- a/tests/test-issue672.out Mon Jun 08 18:14:44 2009 -0500 +++ b/tests/test-issue672.out Mon Jun 08 18:14:44 2009 -0500 @@ -2,15 +2,15 @@ adding 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head -resolving manifests - overwrite None partial False - ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 checking for directory renames +resolving manifests + overwrite None partial False + ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c 1: other deleted -> r 1a: remote created -> g removing 1 @@ -20,15 +20,15 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -resolving manifests - overwrite None partial False - ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 searching for copies back to rev 1 unmatched files in local: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames +resolving manifests + overwrite None partial False + ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 1a: local copied/moved to 1 -> m preserving 1a for resolve of 1a picked tool 'internal:merge' for 1a (binary False symlink False) @@ -38,15 +38,15 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -resolving manifests - overwrite None partial False - ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames +resolving manifests + overwrite None partial False + ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 1: remote moved to 1a -> m preserving 1 for resolve of 1a removing 1