Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 8740:cef68b50078c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop recreating case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 226f1005133c
children e592180ba435
comparison
equal deleted inserted replaced
8739:226f1005133c 8740:cef68b50078c
246 f2, f, f, fmerge(f2, f, f2), False) 246 f2, f, f, fmerge(f2, f, f2), False)
247 else: # case 3,20 A/B/A 247 else: # case 3,20 A/B/A
248 act("remote moved to " + f, "m", 248 act("remote moved to " + f, "m",
249 f2, f, f, fmerge(f2, f, f2), True) 249 f2, f, f, fmerge(f2, f, f2), True)
250 elif f in ma: 250 elif f in ma:
251 if overwrite or backwards: 251 if n != ma[f]:
252 act("recreating", "g", f, m2.flags(f))
253 elif n != ma[f]:
254 if repo.ui.prompt( 252 if repo.ui.prompt(
255 _("remote changed %s which local deleted\n" 253 _("remote changed %s which local deleted\n"
256 "use (c)hanged version or leave (d)eleted?") % f, 254 "use (c)hanged version or leave (d)eleted?") % f,
257 (_("&Changed"), _("&Deleted")), _("c")) == _("c"): 255 (_("&Changed"), _("&Deleted")), _("c")) == _("c"):
258 act("prompt recreating", "g", f, m2.flags(f)) 256 act("prompt recreating", "g", f, m2.flags(f))