Show More
@@ -763,6 +763,11 b' def pathcopies(x, y, match=None):' | |||
|
763 | 763 | base = x |
|
764 | 764 | x_copies = _forwardcopies(a, x) |
|
765 | 765 | y_copies = _forwardcopies(a, y, base, match=match) |
|
766 | same_keys = set(x_copies) & set(y_copies) | |
|
767 | for k in same_keys: | |
|
768 | if x_copies.get(k) == y_copies.get(k): | |
|
769 | del x_copies[k] | |
|
770 | del y_copies[k] | |
|
766 | 771 | x_backward_renames = _reverse_renames(x_copies, x, match) |
|
767 | 772 | copies = _chain( |
|
768 | 773 | x_backward_renames, |
@@ -398,11 +398,8 b' should not report the copy.' | |||
|
398 | 398 | x -> y |
|
399 | 399 | $ hg debugp1copies -r 2 |
|
400 | 400 | x -> y |
|
401 | BROKEN: These two should not report any copies | |
|
402 | 401 | $ hg debugpathcopies 1 2 |
|
403 | x -> y | |
|
404 | 402 | $ hg debugpathcopies 2 1 |
|
405 | x -> y | |
|
406 | 403 | |
|
407 | 404 | Copy x to y on one side of merge, create y and rename to z on the other side. |
|
408 | 405 | $ newrepo |
@@ -223,10 +223,6 b' Graft out of order, skipping a merge and' | |||
|
223 | 223 | committing changelog |
|
224 | 224 | updating the branch cache |
|
225 | 225 | grafting 5:97f8bfe72746 "5" |
|
226 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
|
227 | on local side: | |
|
228 | src: 'c' -> dst: 'b' | |
|
229 | checking for directory renames | |
|
230 | 226 | resolving manifests |
|
231 | 227 | branchmerge: True, force: True, partial: False |
|
232 | 228 | ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
@@ -240,10 +236,6 b' Graft out of order, skipping a merge and' | |||
|
240 | 236 | $ HGEDITOR=cat hg graft 4 3 --log --debug |
|
241 | 237 | scanning for duplicate grafts |
|
242 | 238 | grafting 4:9c233e8e184d "4" |
|
243 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
|
244 | on local side: | |
|
245 | src: 'c' -> dst: 'b' | |
|
246 | checking for directory renames | |
|
247 | 239 | resolving manifests |
|
248 | 240 | branchmerge: True, force: True, partial: False |
|
249 | 241 | ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
General Comments 0
You need to be logged in to leave comments.
Login now