Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3727:0fb66912040a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: report destinations of moves in merge action messages
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
parents 6cb3aca69cdc
children a32b4b930079
comparison
equal deleted inserted replaced
3726:752884db5037 3727:0fb66912040a
222 if overwrite or fmerge(f) != m1.execf(f): 222 if overwrite or fmerge(f) != m1.execf(f):
223 act("update permissions", "e", f, m2.execf(f)) 223 act("update permissions", "e", f, m2.execf(f))
224 elif f in copy: 224 elif f in copy:
225 f2 = copy[f] 225 f2 = copy[f]
226 if f in ma: # case 3,20 A/B/A 226 if f in ma: # case 3,20 A/B/A
227 act("remote moved", "m", f, f2, f2, fmerge(f, f2, f), True) 227 act("remote moved to " + f2, "m",
228 f, f2, f2, fmerge(f, f2, f), True)
228 else: 229 else:
229 if f2 in m1: # case 2 A,B/B/B 230 if f2 in m1: # case 2 A,B/B/B
230 act("local copied", "m", 231 act("local copied to " + f2, "m",
231 f, f2, f, fmerge(f, f2, f2), False) 232 f, f2, f, fmerge(f, f2, f2), False)
232 else: # case 4,21 A/B/B 233 else: # case 4,21 A/B/B
233 act("local moved", "m", 234 act("local moved to " + f2, "m",
234 f, f2, f, fmerge(f, f2, f2), False) 235 f, f2, f, fmerge(f, f2, f2), False)
235 elif f in ma: 236 elif f in ma:
236 if n != ma[f] and not overwrite: 237 if n != ma[f] and not overwrite:
237 if repo.ui.prompt( 238 if repo.ui.prompt(
238 (_(" local changed %s which remote deleted\n") % f) + 239 (_(" local changed %s which remote deleted\n") % f) +
253 if f in copy: 254 if f in copy:
254 f2 = copy[f] 255 f2 = copy[f]
255 if f2 not in m2: # already seen 256 if f2 not in m2: # already seen
256 continue 257 continue
257 # rename case 1, A/A,B/A 258 # rename case 1, A/A,B/A
258 act("remote copied", "m", f2, f, f, fmerge(f2, f, f2), False) 259 act("remote copied to " + f, "m",
260 f2, f, f, fmerge(f2, f, f2), False)
259 elif f in ma: 261 elif f in ma:
260 if overwrite or backwards: 262 if overwrite or backwards:
261 act("recreating", "g", f, m2.execf(f)) 263 act("recreating", "g", f, m2.execf(f))
262 elif n != ma[f]: 264 elif n != ma[f]:
263 if repo.ui.prompt( 265 if repo.ui.prompt(