Mercurial > hg
changeset 15625:efdcce3fd2d5
merge: make debug output easier to read
I always found it hard to figure out what the debug code meant without
the separators.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 09 Dec 2011 17:34:53 +0100 |
| parents | be43234a6d60 |
| children | 931dc4af0d95 |
| files | mercurial/merge.py tests/test-copy-move-merge.t tests/test-double-merge.t tests/test-graft.t tests/test-issue1802.t tests/test-issue522.t tests/test-issue672.t tests/test-merge-commit.t tests/test-merge-types.t tests/test-merge7.t tests/test-rename-dir-merge.t tests/test-rename-merge1.t tests/test-rename-merge2.t tests/test-subrepo.t tests/test-up-local-change.t tests/test-update-reverse.t |
| diffstat | 16 files changed, 99 insertions(+), 98 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Dec 09 15:50:33 2011 +0100 +++ b/mercurial/merge.py Fri Dec 09 17:34:53 2011 +0100 @@ -180,8 +180,9 @@ act("divergent renames", "dr", of, fl) repo.ui.note(_("resolving manifests\n")) - repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial))) - repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2)) + repo.ui.debug(" overwrite: %s, partial: %s\n" + % (bool(overwrite), bool(partial))) + repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, p1, p2)) m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() copied = set(copy.values())
--- a/tests/test-copy-move-merge.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-copy-move-merge.t Fri Dec 09 17:34:53 2011 +0100 @@ -29,8 +29,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6 + overwrite: False, partial: False + ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 a: remote moved to c -> m a: remote moved to b -> m preserving a for resolve of b
--- a/tests/test-double-merge.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-double-merge.t Fri Dec 09 17:34:53 2011 +0100 @@ -33,8 +33,8 @@ bar -> foo * checking for directory renames resolving manifests - overwrite None partial False - ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104 + overwrite: False, partial: False + ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 foo: versions differ -> m foo: remote copied to bar -> m preserving foo for resolve of bar
--- a/tests/test-graft.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-graft.t Fri Dec 09 17:34:53 2011 +0100 @@ -101,8 +101,8 @@ b -> a * checking for directory renames resolving manifests - overwrite False partial False - ancestor 68795b066622 local d2e44c99fd3f+ remote 5d205f8b35b6 + overwrite: False, partial: False + ancestor: 68795b066622, local: d2e44c99fd3f+, remote: 5d205f8b35b6 b: local copied/moved to a -> m preserving b for resolve of b updating: b 1/1 files (100.00%) @@ -122,8 +122,8 @@ unmatched files in local: a.orig resolving manifests - overwrite False partial False - ancestor 4c60f11aa304 local 6f5ea6ac8b70+ remote 97f8bfe72746 + overwrite: False, partial: False + ancestor: 4c60f11aa304, local: 6f5ea6ac8b70+, remote: 97f8bfe72746 e: remote is newer -> g updating: e 1/1 files (100.00%) getting e @@ -139,8 +139,8 @@ unmatched files in local: a.orig resolving manifests - overwrite False partial False - ancestor 4c60f11aa304 local 77eb504366ab+ remote 9c233e8e184d + overwrite: False, partial: False + ancestor: 4c60f11aa304, local: 77eb504366ab+, remote: 9c233e8e184d e: versions differ -> m d: remote is newer -> g preserving e for resolve of e
--- a/tests/test-issue1802.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-issue1802.t Fri Dec 09 17:34:53 2011 +0100 @@ -55,8 +55,8 @@ unmatched files in local: b resolving manifests - overwrite None partial False - ancestor a03b0deabf2b local d6fa54f68ae1+ remote 2d8bcf2dda39 + overwrite: False, partial: False + ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 a: update permissions -> e updating: a 1/1 files (100.00%) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-issue522.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-issue522.t Fri Dec 09 17:34:53 2011 +0100 @@ -29,8 +29,8 @@ unmatched files in local: bar resolving manifests - overwrite None partial False - ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee + overwrite: False, partial: False + ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee foo: remote is newer -> g updating: foo 1/1 files (100.00%) getting foo
--- a/tests/test-issue672.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-issue672.t Fri Dec 09 17:34:53 2011 +0100 @@ -32,8 +32,8 @@ 1a -> 1 checking for directory renames resolving manifests - overwrite None partial False - ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a + overwrite: False, partial: False + ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a 1: other deleted -> r 1a: remote created -> g updating: 1 1/2 files (50.00%) @@ -63,8 +63,8 @@ 1a -> 1 * checking for directory renames resolving manifests - overwrite None partial False - ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 + overwrite: False, 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%) @@ -86,8 +86,8 @@ 1a -> 1 * checking for directory renames resolving manifests - overwrite None partial False - ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8 + overwrite: False, partial: False + ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 1: remote moved to 1a -> m preserving 1 for resolve of 1a removing 1
--- a/tests/test-merge-commit.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-merge-commit.t Fri Dec 09 17:34:53 2011 +0100 @@ -69,8 +69,8 @@ $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28 + overwrite: False, partial: False + ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 bar: versions differ -> m preserving bar for resolve of bar updating: bar 1/1 files (100.00%) @@ -156,8 +156,8 @@ $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0 + overwrite: False, partial: False + ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 bar: versions differ -> m preserving bar for resolve of bar updating: bar 1/1 files (100.00%)
--- a/tests/test-merge-types.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-merge-types.t Fri Dec 09 17:34:53 2011 +0100 @@ -19,8 +19,8 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c + overwrite: False, partial: False + ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e @@ -47,8 +47,8 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f + overwrite: False, partial: False + ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g
--- a/tests/test-merge7.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-merge7.t Fri Dec 09 17:34:53 2011 +0100 @@ -81,8 +81,8 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 96b70246a118 local 50c3a7e29886+ remote 40d11a4173a8 + overwrite: False, partial: False + ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 test.txt: versions differ -> m preserving test.txt for resolve of test.txt updating: test.txt 1/1 files (100.00%)
--- a/tests/test-rename-dir-merge.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-rename-dir-merge.t Fri Dec 09 17:34:53 2011 +0100 @@ -39,8 +39,8 @@ file a/c -> b/c file a/d -> b/d resolving manifests - overwrite None partial False - ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740 + overwrite: False, partial: False + ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 a/d: remote renamed directory to b/d -> d a/c: remote renamed directory to b/c -> d a/b: other deleted -> r @@ -94,8 +94,8 @@ dir a/ -> b/ file a/c -> b/c resolving manifests - overwrite None partial False - ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb + overwrite: False, partial: False + ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb None: local renamed directory to b/c -> d updating:None 1/1 files (100.00%) getting a/c to b/c
--- a/tests/test-rename-merge1.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-rename-merge1.t Fri Dec 09 17:34:53 2011 +0100 @@ -35,8 +35,8 @@ checking for directory renames a2: divergent renames -> dr resolving manifests - overwrite None partial False - ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c + overwrite: False, partial: False + ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c a: remote moved to b -> m b2: remote created -> g preserving a for resolve of b
--- a/tests/test-rename-merge2.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-rename-merge2.t Fri Dec 09 17:34:53 2011 +0100 @@ -84,8 +84,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 + overwrite: False, partial: False + ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 rev: versions differ -> m a: remote copied to b -> m preserving a for resolve of b @@ -119,8 +119,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71 + overwrite: False, partial: False + ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 a: remote is newer -> g b: local copied/moved to a -> m rev: versions differ -> m @@ -157,8 +157,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a + overwrite: False, partial: False + ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a rev: versions differ -> m a: remote moved to b -> m preserving a for resolve of b @@ -192,8 +192,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 + overwrite: False, partial: False + ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 b: local copied/moved to a -> m rev: versions differ -> m preserving b for resolve of b @@ -226,8 +226,8 @@ b -> a checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 + overwrite: False, partial: False + ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 rev: versions differ -> m b: remote created -> g preserving rev for resolve of rev @@ -256,8 +256,8 @@ b -> a checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 + overwrite: False, partial: False + ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 rev: versions differ -> m preserving rev for resolve of rev updating: rev 1/1 files (100.00%) @@ -283,8 +283,8 @@ b -> a checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a + overwrite: False, partial: False + ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a a: other deleted -> r rev: versions differ -> m b: remote created -> g @@ -315,8 +315,8 @@ b -> a checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 + overwrite: False, partial: False + ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 rev: versions differ -> m preserving rev for resolve of rev updating: rev 1/1 files (100.00%) @@ -336,8 +336,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 + overwrite: False, partial: False + ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 b: versions differ -> m rev: versions differ -> m preserving b for resolve of b @@ -375,8 +375,8 @@ checking for directory renames a: divergent renames -> dr resolving manifests - overwrite None partial False - ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e + overwrite: False, partial: False + ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e rev: versions differ -> m c: remote created -> g preserving rev for resolve of rev @@ -404,8 +404,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 + overwrite: False, partial: False + ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 b: versions differ -> m rev: versions differ -> m preserving b for resolve of b @@ -432,8 +432,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 59318016310c+ remote bdb19105162a + overwrite: False, partial: False + ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a a: other deleted -> r b: versions differ -> m rev: versions differ -> m @@ -462,8 +462,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a + overwrite: False, partial: False + ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a a: remote is newer -> g b: versions differ -> m rev: versions differ -> m @@ -493,8 +493,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 59318016310c+ remote bdb19105162a + overwrite: False, partial: False + ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a a: other deleted -> r b: versions differ -> m rev: versions differ -> m @@ -523,8 +523,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a + overwrite: False, partial: False + ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a a: remote is newer -> g b: versions differ -> m rev: versions differ -> m @@ -554,8 +554,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 + overwrite: False, partial: False + ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 b: versions differ -> m rev: versions differ -> m preserving b for resolve of b @@ -582,8 +582,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a + overwrite: False, partial: False + ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a b: versions differ -> m rev: versions differ -> m remote changed a which local deleted @@ -615,8 +615,8 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a + overwrite: False, partial: False + ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a local changed a which remote deleted use (c)hanged version or (d)elete? c a: prompt keep -> a @@ -652,8 +652,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493 + overwrite: False, partial: False + ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 rev: versions differ -> m a: remote moved to b -> m preserving a for resolve of b @@ -686,8 +686,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 + overwrite: False, partial: False + ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 b: local copied/moved to a -> m rev: versions differ -> m preserving b for resolve of b @@ -724,8 +724,8 @@ b -> a * checking for directory renames resolving manifests - overwrite None partial False - ancestor 924404dff337 local 02963e448370+ remote 2b958612230f + overwrite: False, partial: False + ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f b: local copied/moved to a -> m rev: versions differ -> m c: remote created -> g
--- a/tests/test-subrepo.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-subrepo.t Fri Dec 09 17:34:53 2011 +0100 @@ -199,16 +199,16 @@ $ hg merge 6 --debug # test change searching for copies back to rev 2 resolving manifests - overwrite None partial False - ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 + overwrite: False, partial: False + ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 .hgsubstate: versions differ -> m updating: .hgsubstate 1/1 files (100.00%) subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg getting subrepo t resolving manifests - overwrite True partial False - ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a + overwrite: True, partial: False + ancestor: 60ca1237c194+, local: 60ca1237c194+, remote: 6747d179aa9a t: remote is newer -> g updating: t 1/1 files (100.00%) getting t @@ -227,8 +227,8 @@ $ HGMERGE=internal:merge hg merge --debug 7 # test conflict searching for copies back to rev 2 resolving manifests - overwrite None partial False - ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf + overwrite: False, partial: False + ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf .hgsubstate: versions differ -> m updating: .hgsubstate 1/1 files (100.00%) subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 @@ -236,8 +236,8 @@ merging subrepo t searching for copies back to rev 2 resolving manifests - overwrite None partial False - ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 + overwrite: False, partial: False + ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 t: versions differ -> m preserving t for resolve of t updating: t 1/1 files (100.00%)
--- a/tests/test-up-local-change.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-up-local-change.t Fri Dec 09 17:34:53 2011 +0100 @@ -44,8 +44,8 @@ unmatched files in other: b resolving manifests - overwrite False partial False - ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb + overwrite: False, partial: False + ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb a: versions differ -> m b: remote created -> g preserving a for resolve of a @@ -65,8 +65,8 @@ $ hg --debug up 0 resolving manifests - overwrite False partial False - ancestor 1e71731e6fbb local 1e71731e6fbb+ remote c19d34741b0a + overwrite: False, partial: False + ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a a: versions differ -> m b: other deleted -> r preserving a for resolve of a @@ -98,8 +98,8 @@ unmatched files in other: b resolving manifests - overwrite False partial False - ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb + overwrite: False, partial: False + ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb a: versions differ -> m b: remote created -> g preserving a for resolve of a @@ -176,8 +176,8 @@ $ hg --debug merge -f searching for copies back to rev 1 resolving manifests - overwrite False partial False - ancestor c19d34741b0a local 1e71731e6fbb+ remote 83c51d0caff4 + overwrite: False, partial: False + ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 a: versions differ -> m b: versions differ -> m preserving a for resolve of a
--- a/tests/test-update-reverse.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-update-reverse.t Fri Dec 09 17:34:53 2011 +0100 @@ -66,8 +66,8 @@ $ hg update --debug -C 1 resolving manifests - overwrite True partial False - ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf + overwrite: True, partial: False + ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf side2: other deleted -> r side1: other deleted -> r main: remote created -> g