# HG changeset patch # User Pierre-Yves David # Date 2021-07-14 22:22:49 # Node ID ec1d63e6444874b35bbb24bd45902931c919bfb4 # Parent 55c8e0d52eefe82e8b1760fd5a5e9c6a845797d5 dirstate: drop duplicated check This is covered by the `@requires_parents_change` decorator that this function use. Differential Revision: https://phab.mercurial-scm.org/D11125 diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -560,9 +560,6 @@ class dirstate(object): depending of what information ends up being relevant and useful to other processing. """ - if not self.pendingparentchange(): - msg = b'calling `update_file` outside of a parentchange context' - raise error.ProgrammingError(msg) if merged and (clean_p1 or clean_p2): msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' raise error.ProgrammingError(msg)