Show More
@@ -416,14 +416,14 b' def _fullcopytracing(repo, c1, c2, base)' | |||||
416 | # common ancestor or not without explicitly checking it, it's better to |
|
416 | # common ancestor or not without explicitly checking it, it's better to | |
417 | # determine that here. |
|
417 | # determine that here. | |
418 | # |
|
418 | # | |
419 |
# base.descendant(wc) |
|
419 | # base.descendant(wc) is False, work around that | |
420 | _c1 = c1.p1() if c1.rev() is None else c1 |
|
420 | _c1 = c1.p1() if c1.rev() is None else c1 | |
421 | _c2 = c2.p1() if c2.rev() is None else c2 |
|
421 | _c2 = c2.p1() if c2.rev() is None else c2 | |
422 | # an endpoint is "dirty" if it isn't a descendant of the merge base |
|
422 | # an endpoint is "dirty" if it isn't a descendant of the merge base | |
423 | # if we have a dirty endpoint, we need to trigger graft logic, and also |
|
423 | # if we have a dirty endpoint, we need to trigger graft logic, and also | |
424 | # keep track of which endpoint is dirty |
|
424 | # keep track of which endpoint is dirty | |
425 |
dirtyc1 = not |
|
425 | dirtyc1 = not base.descendant(_c1) | |
426 |
dirtyc2 = not |
|
426 | dirtyc2 = not base.descendant(_c2) | |
427 | graft = dirtyc1 or dirtyc2 |
|
427 | graft = dirtyc1 or dirtyc2 | |
428 | tca = base |
|
428 | tca = base | |
429 | if graft: |
|
429 | if graft: |
General Comments 0
You need to be logged in to leave comments.
Login now