Show More
@@ -176,7 +176,16 b' def pathcopies(x, y):' | |||
|
176 | 176 | |
|
177 | 177 | def mergecopies(repo, c1, c2, ca, checkdirs=True): |
|
178 | 178 | """ |
|
179 | Find moves and copies between context c1 and c2 | |
|
179 | Find moves and copies between context c1 and c2 that are relevant | |
|
180 | for merging. | |
|
181 | ||
|
182 | Returns two dicts, "copy" and "diverge". | |
|
183 | ||
|
184 | "copy" is a mapping from source name -> destination name, | |
|
185 | where source is in c1 and destination is in c2 or vice-versa. | |
|
186 | ||
|
187 | "diverge" is a mapping of source name -> list of destination names | |
|
188 | for divergent renames. | |
|
180 | 189 | """ |
|
181 | 190 | # avoid silly behavior for update from empty dir |
|
182 | 191 | if not c1 or not c2 or c1 == c2: |
General Comments 0
You need to be logged in to leave comments.
Login now