equal
deleted
inserted
replaced
559 else: |
559 else: |
560 actx = None |
560 actx = None |
561 fcd = self._filectxorabsent(hash, wctx, dfile) |
561 fcd = self._filectxorabsent(hash, wctx, dfile) |
562 fco = self._filectxorabsent(onode, octx, ofile) |
562 fco = self._filectxorabsent(onode, octx, ofile) |
563 # TODO: move this to filectxorabsent |
563 # TODO: move this to filectxorabsent |
564 fca = self._repo.filectx(afile, fileid=anode, changeid=actx) |
564 fca = self._repo.filectx(afile, fileid=anode, changectx=actx) |
565 # "premerge" x flags |
565 # "premerge" x flags |
566 flo = fco.flags() |
566 flo = fco.flags() |
567 fla = fca.flags() |
567 fla = fca.flags() |
568 if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: |
568 if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: |
569 if fca.node() == nullid and flags != flo: |
569 if fca.node() == nullid and flags != flo: |