Show More
@@ -882,7 +882,14 b' class dirstate(object):' | |||
|
882 | 882 | |
|
883 | 883 | def drop(self, f): |
|
884 | 884 | '''Drop a file from the dirstate''' |
|
885 |
if |
|
|
885 | if self.pendingparentchange(): | |
|
886 | util.nouideprecwarn( | |
|
887 | b"do not use `drop` inside of update/merge context." | |
|
888 | b" Use `update_file`", | |
|
889 | b'6.0', | |
|
890 | stacklevel=2, | |
|
891 | ) | |
|
892 | else: | |
|
886 | 893 | util.nouideprecwarn( |
|
887 | 894 | b"do not use `drop` outside of update/merge context." |
|
888 | 895 | b" Use `set_untracked`", |
General Comments 0
You need to be logged in to leave comments.
Login now