Show More
@@ -1054,7 +1054,7 b' class workingctx(changectx):' | |||
|
1054 | 1054 | wlock.release() |
|
1055 | 1055 | |
|
1056 | 1056 | def dirs(self): |
|
1057 | return self._repo.dirstate.dirs() | |
|
1057 | return set(self._repo.dirstate.dirs()) | |
|
1058 | 1058 | |
|
1059 | 1059 | class workingfilectx(filectx): |
|
1060 | 1060 | """A workingfilectx object makes access to data related to a particular |
@@ -321,7 +321,9 b' def mergecopies(repo, c1, c2, ca):' | |||
|
321 | 321 | |
|
322 | 322 | # generate a directory move map |
|
323 | 323 | d1, d2 = c1.dirs(), c2.dirs() |
|
324 | invalid = set([""]) | |
|
324 | d1.add('') | |
|
325 | d2.add('') | |
|
326 | invalid = set() | |
|
325 | 327 | dirmove = {} |
|
326 | 328 | |
|
327 | 329 | # examine each file copy for a potential directory move, which is |
General Comments 0
You need to be logged in to leave comments.
Login now