Show More
@@ -765,7 +765,14 b' class dirstate(object):' | |||||
765 |
|
765 | |||
766 | def remove(self, f): |
|
766 | def remove(self, f): | |
767 | '''Mark a file removed''' |
|
767 | '''Mark a file removed''' | |
768 |
if |
|
768 | if self.pendingparentchange(): | |
|
769 | util.nouideprecwarn( | |||
|
770 | b"do not use `remove` insde of update/merge context." | |||
|
771 | b" Use `update_file` or `update_file_p1`", | |||
|
772 | b'6.0', | |||
|
773 | stacklevel=2, | |||
|
774 | ) | |||
|
775 | else: | |||
769 | util.nouideprecwarn( |
|
776 | util.nouideprecwarn( | |
770 | b"do not use `remove` outside of update/merge context." |
|
777 | b"do not use `remove` outside of update/merge context." | |
771 | b" Use `set_untracked`", |
|
778 | b" Use `set_untracked`", |
General Comments 0
You need to be logged in to leave comments.
Login now