Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3115:c4e26f1ccfcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: eliminate redundant security check duplicated in applyupdates
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 19:54:01 -0500
parents d1d1cd5b9484
children bb74f809bc95
comparison
equal deleted inserted replaced
3114:d1d1cd5b9484 3115:c4e26f1ccfcc
172 ui.debug(_("local modified %s, keeping\n") % f) 172 ui.debug(_("local modified %s, keeping\n") % f)
173 else: 173 else:
174 ui.debug(_("working dir created %s, keeping\n") % f) 174 ui.debug(_("working dir created %s, keeping\n") % f)
175 175
176 for f, n in m2.iteritems(): 176 for f, n in m2.iteritems():
177 if f[0] == "/":
178 continue
179 if f in ma and n != ma[f]: 177 if f in ma and n != ma[f]:
180 r = _("k") 178 r = _("k")
181 if not overwrite: 179 if not overwrite:
182 r = ui.prompt( 180 r = ui.prompt(
183 (_("remote changed %s which local deleted\n") % f) + 181 (_("remote changed %s which local deleted\n") % f) +