equal
deleted
inserted
replaced
599 actions[m].append(l[0]) |
599 actions[m].append(l[0]) |
600 continue |
600 continue |
601 repo.ui.note(_('end of auction\n\n')) |
601 repo.ui.note(_('end of auction\n\n')) |
602 |
602 |
603 # Prompt and create actions. TODO: Move this towards resolve phase. |
603 # Prompt and create actions. TODO: Move this towards resolve phase. |
604 for f, args, msg in actions['cd']: |
604 for f, args, msg in sorted(actions['cd']): |
605 if f in ancestors[0] and not wctx[f].cmp(ancestors[0][f]): |
605 if f in ancestors[0] and not wctx[f].cmp(ancestors[0][f]): |
606 # local did change but ended up with same content |
606 # local did change but ended up with same content |
607 actions['r'].append((f, None, "prompt same")) |
607 actions['r'].append((f, None, "prompt same")) |
608 elif repo.ui.promptchoice( |
608 elif repo.ui.promptchoice( |
609 _("local changed %s which remote deleted\n" |
609 _("local changed %s which remote deleted\n" |
612 actions['r'].append((f, None, "prompt delete")) |
612 actions['r'].append((f, None, "prompt delete")) |
613 else: |
613 else: |
614 actions['a'].append((f, None, "prompt keep")) |
614 actions['a'].append((f, None, "prompt keep")) |
615 del actions['cd'][:] |
615 del actions['cd'][:] |
616 |
616 |
617 for f, args, msg in actions['dc']: |
617 for f, args, msg in sorted(actions['dc']): |
618 flags, = args |
618 flags, = args |
619 if f in ancestors[0] and not mctx[f].cmp(ancestors[0][f]): |
619 if f in ancestors[0] and not mctx[f].cmp(ancestors[0][f]): |
620 # remote did change but ended up with same content |
620 # remote did change but ended up with same content |
621 pass # don't get = keep local deleted |
621 pass # don't get = keep local deleted |
622 elif repo.ui.promptchoice( |
622 elif repo.ui.promptchoice( |