| Alphare | |
| pulkit |
| hg-reviewers |
This very case is checked in 3 line above that one.
| 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 (1 line) |
| note: the API is at an early stage and we might need to ajust it | note: the API is at an early stage and we might need to ajust it | ||||
| depending of what information ends up being relevant and useful to | depending of what information ends up being relevant and useful to | ||||
| other processing. | other processing. | ||||
| """ | """ | ||||
| if merged and (clean_p1 or clean_p2): | if merged and (clean_p1 or clean_p2): | ||||
| msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | ||||
| raise error.ProgrammingError(msg) | raise error.ProgrammingError(msg) | ||||
| assert not (merged and (clean_p1 or clean_p1)) | |||||
| if not (p1_tracked or p2_tracked or wc_tracked): | if not (p1_tracked or p2_tracked or wc_tracked): | ||||
| self._drop(filename) | self._drop(filename) | ||||
| elif merged: | elif merged: | ||||
| assert wc_tracked | assert wc_tracked | ||||
| if not self.in_merge: | if not self.in_merge: | ||||
| self.normallookup(filename) | self.normallookup(filename) | ||||
| self.otherparent(filename) | self.otherparent(filename) | ||||
| elif not (p1_tracked or p2_tracked) and wc_tracked: | elif not (p1_tracked or p2_tracked) and wc_tracked: | ||||