Show More
@@ -536,7 +536,8 b' class dirstate(object):' | |||||
536 | if not self.in_merge: |
|
536 | if not self.in_merge: | |
537 | msg = _(b"setting %r to other parent only allowed in merges") % f |
|
537 | msg = _(b"setting %r to other parent only allowed in merges") % f | |
538 | raise error.Abort(msg) |
|
538 | raise error.Abort(msg) | |
539 | if f in self and self[f] == b'n': |
|
539 | entry = self._map.get(f) | |
|
540 | if entry is not None and entry.tracked: | |||
540 | # merge-like |
|
541 | # merge-like | |
541 | self._addpath(f, merged=True) |
|
542 | self._addpath(f, merged=True) | |
542 | else: |
|
543 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now