Show More
@@ -906,11 +906,11 b' class workingctx(changectx):' | |||||
906 | try: |
|
906 | try: | |
907 | rejected = [] |
|
907 | rejected = [] | |
908 | for f in files: |
|
908 | for f in files: | |
909 |
if self._repo.dirstate |
|
909 | if f not in self._repo.dirstate: | |
910 | self._repo.dirstate.remove(f) |
|
|||
911 | elif f not in self._repo.dirstate: |
|
|||
912 | self._repo.ui.warn(_("%s not tracked!\n") % join(f)) |
|
910 | self._repo.ui.warn(_("%s not tracked!\n") % join(f)) | |
913 | rejected.append(f) |
|
911 | rejected.append(f) | |
|
912 | elif self._repo.dirstate[f] != 'a': | |||
|
913 | self._repo.dirstate.remove(f) | |||
914 | else: |
|
914 | else: | |
915 | self._repo.dirstate.drop(f) |
|
915 | self._repo.dirstate.drop(f) | |
916 | return rejected |
|
916 | return rejected |
General Comments 0
You need to be logged in to leave comments.
Login now