Show More
@@ -482,7 +482,7 b' class workingfilectx(filectx):' | |||
|
482 | 482 | rp = self._repopath |
|
483 | 483 | if rp == self._path: |
|
484 | 484 | return None |
|
485 |
return rp, self._ |
|
|
485 | return rp, self._changectx._parents[0]._manifest.get(rp, nullid) | |
|
486 | 486 | |
|
487 | 487 | def parents(self): |
|
488 | 488 | '''return parent filectxs, following copies if necessary''' |
General Comments 0
You need to be logged in to leave comments.
Login now