equal
deleted
inserted
replaced
456 return |
456 return |
457 if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: |
457 if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: |
458 return |
458 return |
459 self._addpath(f, 'n', 0, -1, -1) |
459 self._addpath(f, 'n', 0, -1, -1) |
460 self._map.copymap.pop(f, None) |
460 self._map.copymap.pop(f, None) |
461 if f in self._map.nonnormalset: |
|
462 self._map.nonnormalset.remove(f) |
|
463 |
461 |
464 def otherparent(self, f): |
462 def otherparent(self, f): |
465 '''Mark as coming from the other parent, always dirty.''' |
463 '''Mark as coming from the other parent, always dirty.''' |
466 if self._pl[1] == nullid: |
464 if self._pl[1] == nullid: |
467 raise error.Abort(_("setting %r to other parent " |
465 raise error.Abort(_("setting %r to other parent " |