Show More
@@ -338,6 +338,10 b' def mergecopies(repo, c1, c2, base):' | |||||
338 | dirtyc1 = not (base == _c1 or base.descendant(_c1)) |
|
338 | dirtyc1 = not (base == _c1 or base.descendant(_c1)) | |
339 | dirtyc2 = not (base== _c2 or base.descendant(_c2)) |
|
339 | dirtyc2 = not (base== _c2 or base.descendant(_c2)) | |
340 | graft = dirtyc1 or dirtyc2 |
|
340 | graft = dirtyc1 or dirtyc2 | |
|
341 | tca = base | |||
|
342 | if graft: | |||
|
343 | tca = _c1.ancestor(_c2) | |||
|
344 | ||||
341 | limit = _findlimit(repo, c1.rev(), c2.rev()) |
|
345 | limit = _findlimit(repo, c1.rev(), c2.rev()) | |
342 | if limit is None: |
|
346 | if limit is None: | |
343 | # no common ancestor, no copies |
|
347 | # no common ancestor, no copies |
General Comments 0
You need to be logged in to leave comments.
Login now