Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3117:920f54a2249e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: more simplification of m2 manifest scanning
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:10:54 -0500
parents bb74f809bc95
children 7a635ef25132
comparison
equal deleted inserted replaced
3116:bb74f809bc95 3117:920f54a2249e
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 in ma: 177 if f in ma:
178 if n != ma[f]: 178 if overwrite or backwards:
179 r = _("k") 179 ui.debug(_("local deleted %s, recreating\n") % f)
180 if not overwrite: 180 action.append((f, "g", m2.execf(f), n))
181 r = ui.prompt( 181 elif n != ma[f]:
182 (_("remote changed %s which local deleted\n") % f) + 182 r = ui.prompt(
183 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) 183 (_("remote changed %s which local deleted\n") % f) +
184 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
184 if r == _("k"): 185 if r == _("k"):
185 action.append((f, "g", m2.execf(f), n)) 186 action.append((f, "g", m2.execf(f), n))
186 elif overwrite or backwards:
187 ui.debug(_("local deleted %s, recreating\n") % f)
188 action.append((f, "g", m2.execf(f), n))
189 else: 187 else:
190 ui.debug(_("local deleted %s\n") % f) 188 ui.debug(_("local deleted %s\n") % f)
191 else: 189 else:
192 ui.debug(_("remote created %s\n") % f) 190 ui.debug(_("remote created %s\n") % f)
193 action.append((f, "g", m2.execf(f), n)) 191 action.append((f, "g", m2.execf(f), n))