changeset 50022 | e333cc169c45 |
parent 49961 | 7a8bfc05b691 |
child 50055 | c5ef535e274e |
--- a/mercurial/context.py Thu Jan 26 15:50:36 2023 +0100 +++ b/mercurial/context.py Mon Jan 30 19:21:34 2023 +0100 @@ -1867,7 +1867,7 @@ dirstate = self._repo.dirstate if dirstate.identity() == oldid: if fixup: - if dirstate.pendingparentchange(): + if dirstate.is_changing_parents: normal = lambda f, pfd: dirstate.update_file( f, p1_tracked=True, wc_tracked=True )