Mercurial > hg
comparison mercurial/copies.py @ 10313:31141fd7c9cc
copies: check if revisions are related (bug found with pylint)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 02 Feb 2010 09:05:20 +0100 |
parents | 00099580ca35 |
children | 5ddde896a19d |
comparison
equal
deleted
inserted
replaced
10302:00099580ca35 | 10313:31141fd7c9cc |
---|---|
152 continue # no match, keep looking | 152 continue # no match, keep looking |
153 if m2[of] == ma.get(of): | 153 if m2[of] == ma.get(of): |
154 break # no merge needed, quit early | 154 break # no merge needed, quit early |
155 c2 = ctx(of, m2[of]) | 155 c2 = ctx(of, m2[of]) |
156 cr = related(oc, c2, ca.rev()) | 156 cr = related(oc, c2, ca.rev()) |
157 if of == f or of == c2.path(): # non-divergent | 157 if cr and (of == f or of == c2.path()): # non-divergent |
158 copy[f] = of | 158 copy[f] = of |
159 of = None | 159 of = None |
160 break | 160 break |
161 | 161 |
162 if of in ma: | 162 if of in ma: |