Mercurial > hg
diff tests/test-rename-merge2.t @ 42167:91a0bc50b288
copies: delete debug message about search limit
I'm about to rewrite mergecopies() and this message will no longer be
emitted then. Let's remove the message now to remove a distraction
from that patch.
Differential Revision: https://phab.mercurial-scm.org/D6249
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 11 Apr 2019 23:28:38 -0700 |
parents | 96bd75e67a94 |
children | a68036b849b0 |
line wrap: on
line diff
--- a/tests/test-rename-merge2.t Mon Apr 15 22:58:10 2019 -0700 +++ b/tests/test-rename-merge2.t Thu Apr 11 23:28:38 2019 -0700 @@ -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