Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8746:84c44c9ed555

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: combine three identical 'remote is newer' cases
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 8fd6f6b8b37d
children 9b3fd8ab3558
comparison
equal deleted inserted replaced
8745:8fd6f6b8b37d 8746:84c44c9ed555
184 # are both different from the ancestor? 184 # are both different from the ancestor?
185 if n != a and m2[f] != a: 185 if n != a and m2[f] != a:
186 act("versions differ", "m", f, f, f, rflags, False) 186 act("versions differ", "m", f, f, f, rflags, False)
187 # is remote's version newer? 187 # is remote's version newer?
188 elif m2[f] != a: 188 elif m2[f] != a:
189 # are we clobbering? 189 act("remote is newer", "g", f, rflags)
190 if overwrite:
191 act("clobbering", "g", f, rflags)
192 # or are we going back in time and clean?
193 elif backwards:
194 act("reverting", "g", f, rflags)
195 else:
196 act("remote is newer", "g", f, rflags)
197 # local is newer, not overwrite, check mode bits 190 # local is newer, not overwrite, check mode bits
198 elif m1.flags(f) != rflags: 191 elif m1.flags(f) != rflags:
199 act("update permissions", "e", f, rflags) 192 act("update permissions", "e", f, rflags)
200 # contents same, check mode bits 193 # contents same, check mode bits
201 elif m1.flags(f) != rflags: 194 elif m1.flags(f) != rflags: