Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 23426:19ebd2f88fc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Dec 2014 19:34:11 -0600
parents cd9e5e57064d 902554884335
children 6a92b5fcfba8
comparison
equal deleted inserted replaced
23411:2d86f4e38c08 23426:19ebd2f88fc7
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 actions['cd']:
605 if repo.ui.promptchoice( 605 if f in ancestors[0] and not wctx[f].cmp(ancestors[0][f]):
606 # local did change but ended up with same content
607 actions['r'].append((f, None, "prompt same"))
608 elif repo.ui.promptchoice(
606 _("local changed %s which remote deleted\n" 609 _("local changed %s which remote deleted\n"
607 "use (c)hanged version or (d)elete?" 610 "use (c)hanged version or (d)elete?"
608 "$$ &Changed $$ &Delete") % f, 0): 611 "$$ &Changed $$ &Delete") % f, 0):
609 actions['r'].append((f, None, "prompt delete")) 612 actions['r'].append((f, None, "prompt delete"))
610 else: 613 else:
611 actions['a'].append((f, None, "prompt keep")) 614 actions['a'].append((f, None, "prompt keep"))
612 del actions['cd'][:] 615 del actions['cd'][:]
613 616
614 for f, args, msg in actions['dc']: 617 for f, args, msg in actions['dc']:
615 flags, = args 618 flags, = args
616 if repo.ui.promptchoice( 619 if f in ancestors[0] and not mctx[f].cmp(ancestors[0][f]):
620 # remote did change but ended up with same content
621 pass # don't get = keep local deleted
622 elif repo.ui.promptchoice(
617 _("remote changed %s which local deleted\n" 623 _("remote changed %s which local deleted\n"
618 "use (c)hanged version or leave (d)eleted?" 624 "use (c)hanged version or leave (d)eleted?"
619 "$$ &Changed $$ &Deleted") % f, 0) == 0: 625 "$$ &Changed $$ &Deleted") % f, 0) == 0:
620 actions['g'].append((f, (flags,), "prompt recreating")) 626 actions['g'].append((f, (flags,), "prompt recreating"))
621 del actions['dc'][:] 627 del actions['dc'][:]