diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -552,7 +552,6 @@ tca = _c1.ancestor(_c2) limit = _findlimit(repo, c1, c2) - repo.ui.debug(" searching for copies back to rev %d\n" % limit) m1 = c1.manifest() m2 = c2.manifest() diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t --- a/tests/test-copy-move-merge.t +++ b/tests/test-copy-move-merge.t @@ -23,7 +23,6 @@ $ hg ci -qAm "other" $ hg merge --debug - searching for copies back to rev 1 unmatched files in other: b c diff --git a/tests/test-double-merge.t b/tests/test-double-merge.t --- a/tests/test-double-merge.t +++ b/tests/test-double-merge.t @@ -26,7 +26,6 @@ summary: cp foo bar; change both $ hg merge --debug - searching for copies back to rev 1 unmatched files in other: bar all copies found (* = to merge, ! = divergent, % = renamed and deleted): diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -199,7 +199,6 @@ scanning for duplicate grafts skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) grafting 1:5d205f8b35b6 "1" - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -221,7 +220,6 @@ committing changelog updating the branch cache grafting 5:97f8bfe72746 "5" - searching for copies back to rev 1 unmatched files in other (from topological common ancestor): c resolving manifests @@ -237,7 +235,6 @@ $ HGEDITOR=cat hg graft 4 3 --log --debug scanning for duplicate grafts grafting 4:9c233e8e184d "4" - searching for copies back to rev 1 unmatched files in other (from topological common ancestor): c resolving manifests @@ -744,7 +741,6 @@ $ hg graft -q 13 --debug scanning for duplicate grafts grafting 13:7a4785234d87 "2" - searching for copies back to rev 12 unmatched files in other (from topological common ancestor): g unmatched files new in both: diff --git a/tests/test-issue1802.t b/tests/test-issue1802.t --- a/tests/test-issue1802.t +++ b/tests/test-issue1802.t @@ -52,7 +52,6 @@ Simulate a Windows merge: $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug - searching for copies back to rev 1 unmatched files in local: b resolving manifests diff --git a/tests/test-issue522.t b/tests/test-issue522.t --- a/tests/test-issue522.t +++ b/tests/test-issue522.t @@ -25,7 +25,6 @@ $ hg ci -qAm 'add bar' $ hg merge --debug - searching for copies back to rev 1 unmatched files in local: bar resolving manifests diff --git a/tests/test-issue672.t b/tests/test-issue672.t --- a/tests/test-issue672.t +++ b/tests/test-issue672.t @@ -25,7 +25,6 @@ created new head $ hg merge --debug 1 - searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -54,7 +53,6 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge -y --debug 4 - searching for copies back to rev 1 unmatched files in local: 1a all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -64,8 +62,8 @@ branchmerge: True, force: False, partial: False ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 preserving 1a for resolve of 1a + 1a: local copied/moved from 1 -> m (premerge) starting 4 threads for background file closing (?) - 1a: local copied/moved from 1 -> m (premerge) picked tool ':merge' for 1a (binary False symlink False changedelete False) merging 1a and 1 to 1a my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9 @@ -77,7 +75,6 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge -y --debug 3 - searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -88,8 +85,8 @@ ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 preserving 1 for resolve of 1a removing 1 + 1a: remote moved from 1 -> m (premerge) starting 4 threads for background file closing (?) - 1a: remote moved from 1 -> m (premerge) picked tool ':merge' for 1a (binary False symlink False changedelete False) merging 1 and 1a to 1a my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9 diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t --- a/tests/test-merge-commit.t +++ b/tests/test-merge-commit.t @@ -67,7 +67,6 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 @@ -155,7 +154,6 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t --- a/tests/test-merge-criss-cross.t +++ b/tests/test-merge-criss-cross.t @@ -75,7 +75,6 @@ $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor='!' note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 alternatively, use --config merge.preferancestor=40663881a6dd - searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 @@ -137,7 +136,6 @@ note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd calculating bids for ancestor 0f6b37dbe527 - searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 @@ -145,7 +143,6 @@ f2: versions differ -> m calculating bids for ancestor 40663881a6dd - searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 @@ -182,7 +179,6 @@ note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd calculating bids for ancestor 0f6b37dbe527 - searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 @@ -190,7 +186,6 @@ f2: versions differ -> m calculating bids for ancestor 40663881a6dd - searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 @@ -249,7 +244,6 @@ note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd calculating bids for ancestor 0f6b37dbe527 - searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 @@ -257,7 +251,6 @@ f2: versions differ -> m calculating bids for ancestor 40663881a6dd - searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 @@ -417,7 +410,6 @@ note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e calculating bids for ancestor 11b5b303e36c - searching for copies back to rev 3 unmatched files in local: d1/a d1/b @@ -429,7 +421,6 @@ d2/b: remote created -> g calculating bids for ancestor 154e6000f54e - searching for copies back to rev 3 unmatched files in other: d2/b all copies found (* = to merge, ! = divergent, % = renamed and deleted): diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t --- a/tests/test-merge-types.t +++ b/tests/test-merge-types.t @@ -30,7 +30,6 @@ Symlink is local parent, executable is other: $ hg merge --debug - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c @@ -63,7 +62,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :union - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -86,7 +84,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :merge3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -109,7 +106,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :merge-local - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -131,7 +127,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :merge-other - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -165,7 +160,6 @@ $ hg up -Cq 0 $ echo data > a $ HGMERGE= hg up -y --debug --config ui.merge= - searching for copies back to rev 2 resolving manifests branchmerge: False, force: False, partial: False ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f diff --git a/tests/test-merge7.t b/tests/test-merge7.t --- a/tests/test-merge7.t +++ b/tests/test-merge7.t @@ -81,7 +81,6 @@ new changesets 40d11a4173a8 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge --debug - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -248,7 +248,6 @@ getting f1.txt merge against 9:e31216eec445 detach base 8:8e4e2c1a07ae - searching for copies back to rev 3 unmatched files in other (from topological common ancestor): f2.txt resolving manifests @@ -268,7 +267,6 @@ already in destination merge against 10:2f2496ddf49d detach base 9:e31216eec445 - searching for copies back to rev 3 unmatched files in other (from topological common ancestor): f2.txt resolving manifests diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t --- a/tests/test-rename-dir-merge.t +++ b/tests/test-rename-dir-merge.t @@ -24,7 +24,6 @@ created new head $ hg merge --debug 1 - searching for copies back to rev 1 unmatched files in local: a/c unmatched files in other: @@ -70,7 +69,6 @@ $ hg co -C 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge --debug 2 - searching for copies back to rev 1 unmatched files in local: b/a b/b diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t --- a/tests/test-rename-merge1.t +++ b/tests/test-rename-merge1.t @@ -22,7 +22,6 @@ created new head $ hg merge -y --debug - searching for copies back to rev 1 unmatched files in local: c2 unmatched files in other: @@ -168,7 +167,6 @@ $ hg commit -m "deleted file" created new head $ hg merge --debug - searching for copies back to rev 1 unmatched files in other: newfile all copies found (* = to merge, ! = divergent, % = renamed and deleted): diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t --- a/tests/test-rename-merge2.t +++ b/tests/test-rename-merge2.t @@ -76,7 +76,6 @@ -------------- test L:up a R:nc a b W: - 1 get local a to b -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -115,7 +114,6 @@ -------------- test L:nc a b R:up a W: - 2 get rem change to a and b -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -155,7 +153,6 @@ -------------- test L:up a R:nm a b W: - 3 get local a change to b, remove a -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -194,7 +191,6 @@ -------------- test L:nm a b R:up a W: - 4 get remote change to b -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -232,7 +228,6 @@ -------------- test L: R:nc a b W: - 5 get b -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -265,7 +260,6 @@ -------------- test L:nc a b R: W: - 6 nothing -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -297,7 +291,6 @@ -------------- test L: R:nm a b W: - 7 get b -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -331,7 +324,6 @@ -------------- test L:nm a b R: W: - 8 nothing -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -362,7 +354,6 @@ -------------- test L:um a b R:um a b W: - 9 do merge with ancestor in a -------------- - searching for copies back to rev 1 unmatched files new in both: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -406,7 +397,6 @@ -------------- test L:nm a b R:nm a c W: - 11 get c, keep b -------------- - searching for copies back to rev 1 unmatched files in local: b unmatched files in other: @@ -445,7 +435,6 @@ -------------- test L:nc a b R:up b W: - 12 merge b no ancestor -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -484,7 +473,6 @@ -------------- test L:up b R:nm a b W: - 13 merge b no ancestor -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -524,7 +512,6 @@ -------------- test L:nc a b R:up a b W: - 14 merge b no ancestor -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -564,7 +551,6 @@ -------------- test L:up b R:nm a b W: - 15 merge b no ancestor, remove a -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -604,7 +590,6 @@ -------------- test L:nc a b R:up a b W: - 16 get a, merge b no ancestor -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -644,7 +629,6 @@ -------------- test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -683,7 +667,6 @@ -------------- test L:nm a b R:up a b W: - 18 merge b no ancestor -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -728,7 +711,6 @@ -------------- test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a -------------- - searching for copies back to rev 1 unmatched files new in both: b resolving manifests @@ -774,7 +756,6 @@ -------------- test L:up a R:um a b W: - 20 merge a and b to b, remove a -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -817,7 +798,6 @@ -------------- test L:um a b R:up a W: - 21 merge a and b to b -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -862,7 +842,6 @@ -------------- test L:nm a b R:up a c W: - 23 get c, keep b -------------- - searching for copies back to rev 1 unmatched files in local: b unmatched files in other: @@ -943,7 +922,6 @@ $ echo m > 7/f $ echo m > 8/f $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null - searching for copies back to rev 1 unmatched files in local: 5/g 6/g diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -274,7 +274,6 @@ $ hg ci -m9 created new head $ hg merge 6 --debug # test change - searching for copies back to rev 2 resolving manifests branchmerge: True, force: False, partial: False ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 @@ -301,7 +300,6 @@ $ hg ci -m10 committing subrepository t $ HGMERGE=internal:merge hg merge --debug 7 # test conflict - searching for copies back to rev 2 resolving manifests branchmerge: True, force: False, partial: False ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf @@ -313,7 +311,6 @@ starting 4 threads for background file closing (?) (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m merging subrepository "t" - searching for copies back to rev 2 resolving manifests branchmerge: True, force: False, partial: False ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t --- a/tests/test-up-local-change.t +++ b/tests/test-up-local-change.t @@ -40,7 +40,6 @@ summary: 1 $ hg --debug up - searching for copies back to rev 1 unmatched files in other: b resolving manifests @@ -68,7 +67,6 @@ $ hg --debug up 0 starting 4 threads for background file closing (?) - searching for copies back to rev 0 unmatched files in local (from topological common ancestor): b resolving manifests @@ -95,7 +93,6 @@ summary: 1 $ hg --debug up - searching for copies back to rev 1 unmatched files in other: b resolving manifests