| changeset 42167 | 91a0bc50b288 |
| parent 42166 | 85f5934016f9 |
| child 42168 | 341bddf88ac5 |
| 42166:85f5934016f9 | 42167:91a0bc50b288 |
|---|---|
550 tca = base |
550 tca = base |
551 if graft: |
551 if graft: |
552 tca = _c1.ancestor(_c2) |
552 tca = _c1.ancestor(_c2) |
553 |
553 |
554 limit = _findlimit(repo, c1, c2) |
554 limit = _findlimit(repo, c1, c2) |
555 repo.ui.debug(" searching for copies back to rev %d\n" % limit) |
|
556 |
555 |
557 m1 = c1.manifest() |
556 m1 = c1.manifest() |
558 m2 = c2.manifest() |
557 m2 = c2.manifest() |
559 mb = base.manifest() |
558 mb = base.manifest() |
560 |
559 |