diff options
Diffstat (limited to 'tests/test-issue672.t')
| -rw-r--r-- | tests/test-issue672.t | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/test-issue672.t b/tests/test-issue672.t index a6e4fcb..c2041d7 100644 --- a/tests/test-issue672.t +++ b/tests/test-issue672.t @@ -28,12 +28,12 @@ http://mercurial.selenic.com/bts/issue672 searching for copies back to rev 1 unmatched files in other: 1a - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): 1a -> 1 checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a + overwrite None partial False + ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a 1: other deleted -> r 1a: remote created -> g updating: 1 1/2 files (50.00%) @@ -59,12 +59,12 @@ http://mercurial.selenic.com/bts/issue672 searching for copies back to rev 1 unmatched files in local: 1a - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 + overwrite None partial False + ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 1a: local copied/moved to 1 -> m preserving 1a for resolve of 1a updating: 1a 1/1 files (100.00%) @@ -82,12 +82,12 @@ http://mercurial.selenic.com/bts/issue672 searching for copies back to rev 1 unmatched files in other: 1a - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 + overwrite None partial False + ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8 1: remote moved to 1a -> m preserving 1 for resolve of 1a removing 1 |