Show More
@@ -205,11 +205,14 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
205 | elif dsrc in dirmove and dirmove[dsrc] != ddst: |
|
205 | elif dsrc in dirmove and dirmove[dsrc] != ddst: | |
206 | # files from the same directory moved to two different places |
|
206 | # files from the same directory moved to two different places | |
207 | invalid[dsrc] = True |
|
207 | invalid[dsrc] = True | |
208 | del dirmove[dsrc] |
|
|||
209 | else: |
|
208 | else: | |
210 | # looks good so far |
|
209 | # looks good so far | |
211 | dirmove[dsrc + "/"] = ddst + "/" |
|
210 | dirmove[dsrc + "/"] = ddst + "/" | |
212 |
|
211 | |||
|
212 | for i in invalid: | |||
|
213 | if i in dirmove: | |||
|
214 | del dirmove[i] | |||
|
215 | ||||
213 | del d1, d2, invalid |
|
216 | del d1, d2, invalid | |
214 |
|
217 | |||
215 | if not dirmove: |
|
218 | if not dirmove: |
General Comments 0
You need to be logged in to leave comments.
Login now