Show More
@@ -180,7 +180,7 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
180 | continue |
|
180 | continue | |
181 | # named changed on only one side? |
|
181 | # named changed on only one side? | |
182 | if ca.path() == c.path() or ca.path() == c2.path(): |
|
182 | if ca.path() == c.path() or ca.path() == c2.path(): | |
183 |
if c == ca |
|
183 | if c == ca and c2 == ca: # no merge needed, ignore copy | |
184 | continue |
|
184 | continue | |
185 | copy[c.path()] = of |
|
185 | copy[c.path()] = of | |
186 |
|
186 | |||
@@ -280,7 +280,7 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
280 |
|
280 | |||
281 | def symmetricdifference(repo, rev1, rev2): |
|
281 | def symmetricdifference(repo, rev1, rev2): | |
282 | """symmetric difference of the sets of ancestors of rev1 and rev2 |
|
282 | """symmetric difference of the sets of ancestors of rev1 and rev2 | |
283 |
|
283 | |||
284 | I.e. revisions that are ancestors of rev1 or rev2, but not both. |
|
284 | I.e. revisions that are ancestors of rev1 or rev2, but not both. | |
285 | """ |
|
285 | """ | |
286 | # basic idea: |
|
286 | # basic idea: |
General Comments 0
You need to be logged in to leave comments.
Login now