Show More
@@ -631,6 +631,10 b' def _checkcopies(ctx, f, m1, m2, base, t' | |||
|
631 | 631 | backwards = not remotebase and base != tca and f in mb |
|
632 | 632 | getfctx = _makegetfctx(ctx) |
|
633 | 633 | |
|
634 | if m1[f] == mb.get(f) and not remotebase: | |
|
635 | # Nothing to merge | |
|
636 | return | |
|
637 | ||
|
634 | 638 | of = None |
|
635 | 639 | seen = set([f]) |
|
636 | 640 | for oc in getfctx(f, m1[f]).ancestors(): |
@@ -181,9 +181,6 b' Graft out of order, skipping a merge and' | |||
|
181 | 181 | searching for copies back to rev 1 |
|
182 | 182 | unmatched files in other (from topological common ancestor): |
|
183 | 183 | c |
|
184 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
|
185 | src: 'c' -> dst: 'b' * | |
|
186 | checking for directory renames | |
|
187 | 184 | resolving manifests |
|
188 | 185 | branchmerge: True, force: True, partial: False |
|
189 | 186 | ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
@@ -200,9 +197,6 b' Graft out of order, skipping a merge and' | |||
|
200 | 197 | searching for copies back to rev 1 |
|
201 | 198 | unmatched files in other (from topological common ancestor): |
|
202 | 199 | c |
|
203 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
|
204 | src: 'c' -> dst: 'b' * | |
|
205 | checking for directory renames | |
|
206 | 200 | resolving manifests |
|
207 | 201 | branchmerge: True, force: True, partial: False |
|
208 | 202 | ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
@@ -1280,3 +1274,15 b' Check the results of the grafts tested' | |||
|
1280 | 1274 | |
|
1281 | 1275 | $ hg cat f2c |
|
1282 | 1276 | c2e |
|
1277 | ||
|
1278 | Check superfluous filemerge of files renamed in the past but untouched by graft | |
|
1279 | ||
|
1280 | $ echo a > a | |
|
1281 | $ hg ci -qAma | |
|
1282 | $ hg mv a b | |
|
1283 | $ echo b > b | |
|
1284 | $ hg ci -qAmb | |
|
1285 | $ echo c > c | |
|
1286 | $ hg ci -qAmc | |
|
1287 | $ hg up -q .~2 | |
|
1288 | $ hg graft tip -qt:fail |
@@ -66,7 +66,7 b' Local merge with bad merge tool:' | |||
|
66 | 66 | merging zzz1_merge_ok |
|
67 | 67 | merging zzz2_merge_bad |
|
68 | 68 | warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
|
69 |
2 files updated, 1 files merged, |
|
|
69 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved | |
|
70 | 70 | use 'hg resolve' to retry unresolved file merges |
|
71 | 71 | [1] |
|
72 | 72 | |
@@ -104,7 +104,7 b' Local merge with conflicts:' | |||
|
104 | 104 | merging zzz1_merge_ok |
|
105 | 105 | merging zzz2_merge_bad |
|
106 | 106 | warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
|
107 |
2 files updated, 1 files merged, |
|
|
107 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved | |
|
108 | 108 | use 'hg resolve' to retry unresolved file merges |
|
109 | 109 | [1] |
|
110 | 110 |
General Comments 0
You need to be logged in to leave comments.
Login now