Show More
@@ -502,9 +502,8 b' class dirstate(object):' | |||||
502 | def otherparent(self, f): |
|
502 | def otherparent(self, f): | |
503 | '''Mark as coming from the other parent, always dirty.''' |
|
503 | '''Mark as coming from the other parent, always dirty.''' | |
504 | if self._pl[1] == self._nodeconstants.nullid: |
|
504 | if self._pl[1] == self._nodeconstants.nullid: | |
505 | raise error.Abort( |
|
505 | msg = _(b"setting %r to other parent only allowed in merges") % f | |
506 | _(b"setting %r to other parent only allowed in merges") % f |
|
506 | raise error.Abort(msg) | |
507 | ) |
|
|||
508 | if f in self and self[f] == b'n': |
|
507 | if f in self and self[f] == b'n': | |
509 | # merge-like |
|
508 | # merge-like | |
510 | self._addpath(f, b'm', 0, -2, -1) |
|
509 | self._addpath(f, b'm', 0, -2, -1) |
General Comments 0
You need to be logged in to leave comments.
Login now