479 for lfile in lfiles: |
479 for lfile in lfiles: |
480 standin = lfutil.standin(lfile) |
480 standin = lfutil.standin(lfile) |
481 (lm, largs, lmsg) = actions.get(lfile, (None, None, None)) |
481 (lm, largs, lmsg) = actions.get(lfile, (None, None, None)) |
482 (sm, sargs, smsg) = actions.get(standin, (None, None, None)) |
482 (sm, sargs, smsg) = actions.get(standin, (None, None, None)) |
483 if sm in ('g', 'dc') and lm != 'r': |
483 if sm in ('g', 'dc') and lm != 'r': |
|
484 if sm == 'dc': |
|
485 f1, f2, fa, move, anc = sargs |
|
486 sargs = (p2[f2].flags(),) |
484 # Case 1: normal file in the working copy, largefile in |
487 # Case 1: normal file in the working copy, largefile in |
485 # the second parent |
488 # the second parent |
486 usermsg = _('remote turned local normal file %s into a largefile\n' |
489 usermsg = _('remote turned local normal file %s into a largefile\n' |
487 'use (l)argefile or keep (n)ormal file?' |
490 'use (l)argefile or keep (n)ormal file?' |
488 '$$ &Largefile $$ &Normal file') % lfile |
491 '$$ &Largefile $$ &Normal file') % lfile |
494 if branchmerge: |
497 if branchmerge: |
495 actions[standin] = ('k', None, 'replaced by non-standin') |
498 actions[standin] = ('k', None, 'replaced by non-standin') |
496 else: |
499 else: |
497 actions[standin] = ('r', None, 'replaced by non-standin') |
500 actions[standin] = ('r', None, 'replaced by non-standin') |
498 elif lm in ('g', 'dc') and sm != 'r': |
501 elif lm in ('g', 'dc') and sm != 'r': |
|
502 if lm == 'dc': |
|
503 f1, f2, fa, move, anc = largs |
|
504 largs = (p2[f2].flags(),) |
499 # Case 2: largefile in the working copy, normal file in |
505 # Case 2: largefile in the working copy, normal file in |
500 # the second parent |
506 # the second parent |
501 usermsg = _('remote turned local largefile %s into a normal file\n' |
507 usermsg = _('remote turned local largefile %s into a normal file\n' |
502 'keep (l)argefile or use (n)ormal file?' |
508 'keep (l)argefile or use (n)ormal file?' |
503 '$$ &Largefile $$ &Normal file') % lfile |
509 '$$ &Largefile $$ &Normal file') % lfile |