Show More
@@ -387,7 +387,7 b' class dirstate(object):' | |||||
387 | source = self._map.copymap.get(f) |
|
387 | source = self._map.copymap.get(f) | |
388 | if source: |
|
388 | if source: | |
389 | copies[f] = source |
|
389 | copies[f] = source | |
390 | self.add(f) |
|
390 | self._add(f) | |
391 | return copies |
|
391 | return copies | |
392 |
|
392 | |||
393 | def setbranch(self, branch): |
|
393 | def setbranch(self, branch): | |
@@ -547,8 +547,12 b' class dirstate(object):' | |||||
547 |
|
547 | |||
548 | def add(self, f): |
|
548 | def add(self, f): | |
549 | '''Mark a file added.''' |
|
549 | '''Mark a file added.''' | |
550 |
self._add |
|
550 | self._add(f) | |
551 | self._map.copymap.pop(f, None) |
|
551 | ||
|
552 | def _add(self, filename): | |||
|
553 | """internal function to mark a file as added""" | |||
|
554 | self._addpath(filename, added=True) | |||
|
555 | self._map.copymap.pop(filename, None) | |||
552 |
|
556 | |||
553 | def remove(self, f): |
|
557 | def remove(self, f): | |
554 | '''Mark a file removed.''' |
|
558 | '''Mark a file removed.''' |
General Comments 0
You need to be logged in to leave comments.
Login now