Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 7066:865c5be0f8df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix bug going backwards for already reverted files (issue1303)
author Matt Mackall <mpm@selenic.com>
date Wed, 08 Oct 2008 16:22:08 -0500
parents 63b5f4c73c98
children 89207edf3973
comparison
equal deleted inserted replaced
7065:9bc46d069a76 7066:865c5be0f8df
183 a = ma.get(f, nullid) 183 a = ma.get(f, nullid)
184 # are we clobbering? 184 # are we clobbering?
185 if overwrite: 185 if overwrite:
186 act("clobbering", "g", f, rflags) 186 act("clobbering", "g", f, rflags)
187 # or are we going back in time and clean? 187 # or are we going back in time and clean?
188 elif backwards and not n[20:]: 188 elif backwards:
189 act("reverting", "g", f, rflags) 189 if not n[20:] or not p2[f].cmp(p1[f].data()):
190 act("reverting", "g", f, rflags)
190 # are both different from the ancestor? 191 # are both different from the ancestor?
191 elif n != a and m2[f] != a: 192 elif n != a and m2[f] != a:
192 act("versions differ", "m", f, f, f, rflags, False) 193 act("versions differ", "m", f, f, f, rflags, False)
193 # is remote's version newer? 194 # is remote's version newer?
194 elif m2[f] != a: 195 elif m2[f] != a: