Mercurial > hg
comparison mercurial/merge.py @ 3674:9103dab96093
avoid unnecessary copy merges
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 18 Nov 2006 11:34:19 -0600 |
parents | eb0b4a2d70a9 |
children | 91690473856c |
comparison
equal
deleted
inserted
replaced
3673:eb0b4a2d70a9 | 3674:9103dab96093 |
---|---|
137 | 137 |
138 def checkpair(c, f2, man): | 138 def checkpair(c, f2, man): |
139 ''' check if an apparent pair actually matches ''' | 139 ''' check if an apparent pair actually matches ''' |
140 c2 = ctx(f2, man[f2]) | 140 c2 = ctx(f2, man[f2]) |
141 ca = c.ancestor(c2) | 141 ca = c.ancestor(c2) |
142 if c == ca or c2 == ca: | |
143 return | |
142 if ca and ca.path() == c.path() or ca.path() == c2.path(): | 144 if ca and ca.path() == c.path() or ca.path() == c2.path(): |
143 copy[c.path()] = f2 | 145 copy[c.path()] = f2 |
144 copy[f2] = c.path() | 146 copy[f2] = c.path() |
145 | 147 |
146 for f in u1: | 148 for f in u1: |