Mercurial > hg

comparison mercurial/merge.py @ 8518:3f4f14eab085

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update --clean: do not unlink added files (issue575)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 19 May 2009 03:59:58 +0200
parents 0bf0045000b5
children 3682a19bb637
comparison
equal deleted inserted replaced
8517:110763cc3ab0 8518:3f4f14eab085
224 (_("&Changed"), _("&Delete")), _("c")) == _("d"): 224 (_("&Changed"), _("&Delete")), _("c")) == _("d"):
225 act("prompt delete", "r", f) 225 act("prompt delete", "r", f)
226 act("prompt keep", "a", f) 226 act("prompt keep", "a", f)
227 else: 227 else:
228 act("other deleted", "r", f) 228 act("other deleted", "r", f)
229 elif overwrite and n[20:] == "a": # do not erase the working copy
230 act("remote deleted", "f", f)
229 else: 231 else:
230 # file is created on branch or in working directory 232 # file is created on branch or in working directory
231 if (overwrite and n[20:] != "u") or (backwards and not n[20:]): 233 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
232 act("remote deleted", "r", f) 234 act("remote deleted", "r", f)
233 235