##// END OF EJS Templates
copies: introduce getdstfctx...
Stanislau Hlebik -
r32565:5313d980 default
parent child Browse files
Show More
@@ -632,6 +632,7 b' def _checkcopies(srcctx, dstctx, f, base'
632 # We use 'backwards = False' in that case.
632 # We use 'backwards = False' in that case.
633 backwards = not remotebase and base != tca and f in mb
633 backwards = not remotebase and base != tca and f in mb
634 getsrcfctx = _makegetfctx(srcctx)
634 getsrcfctx = _makegetfctx(srcctx)
635 getdstfctx = _makegetfctx(dstctx)
635
636
636 if msrc[f] == mb.get(f) and not remotebase:
637 if msrc[f] == mb.get(f) and not remotebase:
637 # Nothing to merge
638 # Nothing to merge
@@ -658,7 +659,7 b' def _checkcopies(srcctx, dstctx, f, base'
658 continue # no match, keep looking
659 continue # no match, keep looking
659 if mdst[of] == mb.get(of):
660 if mdst[of] == mb.get(of):
660 return # no merge needed, quit early
661 return # no merge needed, quit early
661 c2 = getsrcfctx(of, mdst[of])
662 c2 = getdstfctx(of, mdst[of])
662 # c2 might be a plain new file on added on destination side that is
663 # c2 might be a plain new file on added on destination side that is
663 # unrelated to the droids we are looking for.
664 # unrelated to the droids we are looking for.
664 cr = _related(oc, c2, tca.rev())
665 cr = _related(oc, c2, tca.rev())
General Comments 0
You need to be logged in to leave comments. Login now