Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 7768:5bf5fd1e2a74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mark kept local files as readded on linear update (issue539)
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Feb 2009 10:50:48 -0600
parents 0b2ee57dfdb1
children 89e05c02a4af
comparison
equal deleted inserted replaced
7767:b2410ed2cbe9 7768:5bf5fd1e2a74
218 if repo.ui.prompt( 218 if repo.ui.prompt(
219 _(" local changed %s which remote deleted\n" 219 _(" local changed %s which remote deleted\n"
220 "use (c)hanged version or (d)elete?") % f, 220 "use (c)hanged version or (d)elete?") % f,
221 _("[cd]"), _("c")) == _("d"): 221 _("[cd]"), _("c")) == _("d"):
222 act("prompt delete", "r", f) 222 act("prompt delete", "r", f)
223 act("prompt keep", "a", f)
223 else: 224 else:
224 act("other deleted", "r", f) 225 act("other deleted", "r", f)
225 else: 226 else:
226 # file is created on branch or in working directory 227 # file is created on branch or in working directory
227 if (overwrite and n[20:] != "u") or (backwards and not n[20:]): 228 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
365 if m == "r": # remove 366 if m == "r": # remove
366 if branchmerge: 367 if branchmerge:
367 repo.dirstate.remove(f) 368 repo.dirstate.remove(f)
368 else: 369 else:
369 repo.dirstate.forget(f) 370 repo.dirstate.forget(f)
371 elif m == "a": # re-add
372 if not branchmerge:
373 repo.dirstate.add(f)
370 elif m == "f": # forget 374 elif m == "f": # forget
371 repo.dirstate.forget(f) 375 repo.dirstate.forget(f)
372 elif m == "e": # exec change 376 elif m == "e": # exec change
373 repo.dirstate.normallookup(f) 377 repo.dirstate.normallookup(f)
374 elif m == "g": # get 378 elif m == "g": # get