equal
deleted
inserted
replaced
441 usermsg = _('remote turned local normal file %s into a largefile\n' |
441 usermsg = _('remote turned local normal file %s into a largefile\n' |
442 'use (l)argefile or keep (n)ormal file?' |
442 'use (l)argefile or keep (n)ormal file?' |
443 '$$ &Largefile $$ &Normal file') % lfile |
443 '$$ &Largefile $$ &Normal file') % lfile |
444 if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile |
444 if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile |
445 actions['r'].append((lfile, None, 'replaced by standin')) |
445 actions['r'].append((lfile, None, 'replaced by standin')) |
446 newglist.append((standin, (p2.flags(standin),), msg)) |
446 newglist.append(action) |
447 else: # keep local normal file |
447 else: # keep local normal file |
448 if branchmerge: |
448 if branchmerge: |
449 actions['k'].append((standin, None, |
449 actions['k'].append((standin, None, |
450 'replaced by non-standin')) |
450 'replaced by non-standin')) |
451 else: |
451 else: |
470 |
470 |
471 # linear-merge should treat this largefile as 're-added' |
471 # linear-merge should treat this largefile as 're-added' |
472 actions['a'].append((standin, None, 'keep standin')) |
472 actions['a'].append((standin, None, 'keep standin')) |
473 else: # pick remote normal file |
473 else: # pick remote normal file |
474 actions['r'].append((standin, None, 'replaced by non-standin')) |
474 actions['r'].append((standin, None, 'replaced by non-standin')) |
475 newglist.append((lfile, (p2.flags(lfile),), msg)) |
475 newglist.append(action) |
476 else: |
476 else: |
477 newglist.append(action) |
477 newglist.append(action) |
478 |
478 |
479 actions['g'] = newglist |
479 actions['g'] = newglist |
480 if lfmr: |
480 if lfmr: |