Mercurial > hg

comparison mercurial/merge.py @ 8744:6b675c781c6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify 'other deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents a8d5af707656
children 8fd6f6b8b37d
comparison
equal deleted inserted replaced
8743:a8d5af707656 8744:6b675c781c6d
211 act("local copied to " + f2, "m", 211 act("local copied to " + f2, "m",
212 f, f2, f, fmerge(f, f2, f2), False) 212 f, f2, f, fmerge(f, f2, f2), False)
213 else: # case 4,21 A/B/B 213 else: # case 4,21 A/B/B
214 act("local moved to " + f2, "m", 214 act("local moved to " + f2, "m",
215 f, f2, f, fmerge(f, f2, f2), False) 215 f, f2, f, fmerge(f, f2, f2), False)
216 elif f in ma and not n[20:]: 216 elif n[20:] == "a": # added, no remote
217 act("remote deleted", "f", f)
218 elif f in ma: # clean, a different, no remote
217 if n != ma[f]: 219 if n != ma[f]:
218 if repo.ui.prompt( 220 if repo.ui.prompt(
219 _(" local changed %s which remote deleted\n" 221 _(" local changed %s which remote deleted\n"
220 "use (c)hanged version or (d)elete?") % f, 222 "use (c)hanged version or (d)elete?") % f,
221 (_("&Changed"), _("&Delete")), _("c")) == _("d"): 223 (_("&Changed"), _("&Delete")), _("c")) == _("d"):
222 act("prompt delete", "r", f) 224 act("prompt delete", "r", f)
223 else: 225 else:
224 act("prompt keep", "a", f) 226 act("prompt keep", "a", f)
225 else: 227 elif n[20:] != "u":
226 act("other deleted", "r", f) 228 act("other deleted", "r", f)
227 elif n[20:] == "a": # only forget locally-added
228 act("remote deleted", "f", f)
229 else: 229 else:
230 # file is created on branch or in working directory 230 # file is created on branch or in working directory
231 if (overwrite and n[20:] != "u") or (backwards and not n[20:]): 231 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
232 act("remote deleted", "r", f) 232 act("remote deleted", "r", f)
233 233