Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8738:8a9899a6327e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify a delete case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents a1808b40a8fb
children 226f1005133c
comparison
equal deleted inserted replaced
8737:a1808b40a8fb 8738:8a9899a6327e
220 act("prompt delete", "r", f) 220 act("prompt delete", "r", f)
221 else: 221 else:
222 act("prompt keep", "a", f) 222 act("prompt keep", "a", f)
223 else: 223 else:
224 act("other deleted", "r", f) 224 act("other deleted", "r", f)
225 elif overwrite and n[20:] == "a": # do not erase the working copy 225 elif n[20:] == "a": # only forget locally-added
226 act("remote deleted", "f", f) 226 act("remote deleted", "f", f)
227 else: 227 else:
228 # file is created on branch or in working directory 228 # file is created on branch or in working directory
229 if (overwrite and n[20:] != "u") or (backwards and not n[20:]): 229 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
230 act("remote deleted", "r", f) 230 act("remote deleted", "r", f)