Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8748:f325574dad1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: combine a copy and move case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 9b3fd8ab3558
children 69caf50da4a0
comparison
equal deleted inserted replaced
8747:9b3fd8ab3558 8748:f325574dad1a
197 elif f in copy: 197 elif f in copy:
198 f2 = copy[f] 198 f2 = copy[f]
199 if f2 not in m2: # directory rename 199 if f2 not in m2: # directory rename
200 act("remote renamed directory to " + f2, "d", 200 act("remote renamed directory to " + f2, "d",
201 f, None, f2, m1.flags(f)) 201 f, None, f2, m1.flags(f))
202 elif f2 in m1: # case 2 A,B/B/B 202 else: # case 2 A,B/B/B or case 4,21 A/B/B
203 act("local copied to " + f2, "m", 203 act("local copied/moved to " + f2, "m",
204 f, f2, f, fmerge(f, f2, f2), False)
205 else: # case 4,21 A/B/B
206 act("local moved to " + f2, "m",
207 f, f2, f, fmerge(f, f2, f2), False) 204 f, f2, f, fmerge(f, f2, f2), False)
208 elif n[20:] == "a": # added, no remote 205 elif n[20:] == "a": # added, no remote
209 act("remote deleted", "f", f) 206 act("remote deleted", "f", f)
210 elif f in ma: # clean, a different, no remote 207 elif f in ma: # clean, a different, no remote
211 if n != ma[f]: 208 if n != ma[f]: