Show More
@@ -479,9 +479,7 b' class dirstate:' | |||||
479 | def branch(self): |
|
479 | def branch(self): | |
480 | return encoding.tolocal(self._branch) |
|
480 | return encoding.tolocal(self._branch) | |
481 |
|
481 | |||
482 | # XXX since this make the dirstate dirty, we should enforce that it is done |
|
482 | @requires_changing_parents | |
483 | # withing an appropriate change-context that scope the change and ensure it |
|
|||
484 | # eventually get written on disk (or rolled back) |
|
|||
485 | def setparents(self, p1, p2=None): |
|
483 | def setparents(self, p1, p2=None): | |
486 | """Set dirstate parents to p1 and p2. |
|
484 | """Set dirstate parents to p1 and p2. | |
487 |
|
485 |
General Comments 0
You need to be logged in to leave comments.
Login now