569 elif lfutil.standin(f) in p1: |
569 elif lfutil.standin(f) in p1: |
570 lfiles.add(f) |
570 lfiles.add(f) |
571 |
571 |
572 for lfile in sorted(lfiles): |
572 for lfile in sorted(lfiles): |
573 standin = lfutil.standin(lfile) |
573 standin = lfutil.standin(lfile) |
574 (lm, largs, lmsg) = mresult.actions.get(lfile, (None, None, None)) |
574 (lm, largs, lmsg) = mresult.getfile(lfile, (None, None, None)) |
575 (sm, sargs, smsg) = mresult.actions.get(standin, (None, None, None)) |
575 (sm, sargs, smsg) = mresult.getfile(standin, (None, None, None)) |
576 if sm in (b'g', b'dc') and lm != b'r': |
576 if sm in (b'g', b'dc') and lm != b'r': |
577 if sm == b'dc': |
577 if sm == b'dc': |
578 f1, f2, fa, move, anc = sargs |
578 f1, f2, fa, move, anc = sargs |
579 sargs = (p2[f2].flags(), False) |
579 sargs = (p2[f2].flags(), False) |
580 # Case 1: normal file in the working copy, largefile in |
580 # Case 1: normal file in the working copy, largefile in |