Mercurial > hg
changeset 8741:e592180ba435
merge: reorder remote creation tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | cef68b50078c |
children | a964ab624385 |
files | mercurial/merge.py |
diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Jun 08 18:14:44 2009 -0500 +++ b/mercurial/merge.py Mon Jun 08 18:14:44 2009 -0500 @@ -247,15 +247,14 @@ else: # case 3,20 A/B/A act("remote moved to " + f, "m", f2, f, f, fmerge(f2, f, f2), True) - elif f in ma: - if n != ma[f]: - if repo.ui.prompt( - _("remote changed %s which local deleted\n" - "use (c)hanged version or leave (d)eleted?") % f, - (_("&Changed"), _("&Deleted")), _("c")) == _("c"): - act("prompt recreating", "g", f, m2.flags(f)) - else: + elif f not in ma: act("remote created", "g", f, m2.flags(f)) + elif n != ma[f]: + if repo.ui.prompt( + _("remote changed %s which local deleted\n" + "use (c)hanged version or leave (d)eleted?") % f, + (_("&Changed"), _("&Deleted")), _("c")) == _("c"): + act("prompt recreating", "g", f, m2.flags(f)) return action