equal
deleted
inserted
replaced
629 # the base) this is more complicated as we must detect a divergence. |
629 # the base) this is more complicated as we must detect a divergence. |
630 # We use 'backwards = False' in that case. |
630 # We use 'backwards = False' in that case. |
631 backwards = not remotebase and base != tca and f in mb |
631 backwards = not remotebase and base != tca and f in mb |
632 getfctx = _makegetfctx(ctx) |
632 getfctx = _makegetfctx(ctx) |
633 |
633 |
|
634 if m1[f] == mb.get(f) and not remotebase: |
|
635 # Nothing to merge |
|
636 return |
|
637 |
634 of = None |
638 of = None |
635 seen = set([f]) |
639 seen = set([f]) |
636 for oc in getfctx(f, m1[f]).ancestors(): |
640 for oc in getfctx(f, m1[f]).ancestors(): |
637 ocr = oc.linkrev() |
641 ocr = oc.linkrev() |
638 of = oc.path() |
642 of = oc.path() |