Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8734:60fa3371aa75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pretend ancestor is local to simplify backwards and overwrite
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents f8be48c6b08c
children ff8519c437c6
comparison
equal deleted inserted replaced
8733:f8be48c6b08c 8734:60fa3371aa75
131 131
132 m1 = p1.manifest() 132 m1 = p1.manifest()
133 m2 = p2.manifest() 133 m2 = p2.manifest()
134 ma = pa.manifest() 134 ma = pa.manifest()
135 backwards = (pa == p2) 135 backwards = (pa == p2)
136
137 if backwards or overwrite:
138 ma = m1
139
136 action = [] 140 action = []
137 copy, copied, diverge = {}, {}, {} 141 copy, copied, diverge = {}, {}, {}
138 142
139 def fmerge(f, f2, fa): 143 def fmerge(f, f2, fa):
140 """merge flags""" 144 """merge flags"""
207 act("local copied to " + f2, "m", 211 act("local copied to " + f2, "m",
208 f, f2, f, fmerge(f, f2, f2), False) 212 f, f2, f, fmerge(f, f2, f2), False)
209 else: # case 4,21 A/B/B 213 else: # case 4,21 A/B/B
210 act("local moved to " + f2, "m", 214 act("local moved to " + f2, "m",
211 f, f2, f, fmerge(f, f2, f2), False) 215 f, f2, f, fmerge(f, f2, f2), False)
212 elif f in ma: 216 elif f in ma and not n[20:]:
213 if n != ma[f] and not overwrite: 217 if n != ma[f] and not overwrite:
214 if repo.ui.prompt( 218 if repo.ui.prompt(
215 _(" local changed %s which remote deleted\n" 219 _(" local changed %s which remote deleted\n"
216 "use (c)hanged version or (d)elete?") % f, 220 "use (c)hanged version or (d)elete?") % f,
217 (_("&Changed"), _("&Delete")), _("c")) == _("d"): 221 (_("&Changed"), _("&Delete")), _("c")) == _("d"):