Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8745:8fd6f6b8b37d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop 'remote deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 6b675c781c6d
children 84c44c9ed555
comparison
equal deleted inserted replaced
8744:6b675c781c6d 8745:8fd6f6b8b37d
224 act("prompt delete", "r", f) 224 act("prompt delete", "r", f)
225 else: 225 else:
226 act("prompt keep", "a", f) 226 act("prompt keep", "a", f)
227 elif n[20:] != "u": 227 elif n[20:] != "u":
228 act("other deleted", "r", f) 228 act("other deleted", "r", f)
229 else:
230 # file is created on branch or in working directory
231 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
232 act("remote deleted", "r", f)
233 229
234 for f, n in m2.iteritems(): 230 for f, n in m2.iteritems():
235 if partial and not partial(f): 231 if partial and not partial(f):
236 continue 232 continue
237 if f in m1: 233 if f in m1: