| Alphare |
| hg-reviewers |
All users have been migrated.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (9 lines) |
| def _merge(self, f): | def _merge(self, f): | ||||
| if not self.in_merge: | if not self.in_merge: | ||||
| return self._normallookup(f) | return self._normallookup(f) | ||||
| return self._otherparent(f) | return self._otherparent(f) | ||||
| def drop(self, f): | def drop(self, f): | ||||
| '''Drop a file from the dirstate''' | '''Drop a file from the dirstate''' | ||||
| if not self.pendingparentchange(): | if self.pendingparentchange(): | ||||
| util.nouideprecwarn( | |||||
| b"do not use `drop` inside of update/merge context." | |||||
| b" Use `update_file`", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| else: | |||||
| util.nouideprecwarn( | util.nouideprecwarn( | ||||
| b"do not use `drop` outside of update/merge context." | b"do not use `drop` outside of update/merge context." | ||||
| b" Use `set_untracked`", | b" Use `set_untracked`", | ||||
| b'6.0', | b'6.0', | ||||
| stacklevel=2, | stacklevel=2, | ||||
| ) | ) | ||||
| self._drop(f) | self._drop(f) | ||||