Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 16257:7a5524f240ad stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: accept missing revisions in symlink flag merge (issue3316)
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2012 14:45:41 -0500
parents ca5cc2976574
children 7b9bf72430ba
comparison
equal deleted inserted replaced
16255:ca5cc2976574 16257:7a5524f240ad
171 return "l" # Symlink 171 return "l" # Symlink
172 return "" 172 return ""
173 if m and m != a: # changed from a to m 173 if m and m != a: # changed from a to m
174 return m 174 return m
175 if n and n != a: # changed from a to n 175 if n and n != a: # changed from a to n
176 if (n == 'l' or a == 'l') and m1[f] != ma[f]: 176 if (n == 'l' or a == 'l') and m1.get(f) != ma.get(f):
177 # can't automatically merge symlink flag when there 177 # can't automatically merge symlink flag when there
178 # are file-level conflicts here, let filemerge take 178 # are file-level conflicts here, let filemerge take
179 # care of it 179 # care of it
180 return m 180 return m
181 return n 181 return n