# HG changeset patch # User Pierre-Yves David # Date 1633018051 -7200 # Node ID e2da3ec94169ca75aaaea63de2c75d45c7df2905 # Parent fabf687df0ff3ed9fcaa332090d201f73c81d2bb dirstate-item: point out that `merged` is set only with p1_tracked This is currently True, and we will use this fact to simplify the API in the next commit. However, we add this assertion first to validate that this is True in the whole test-suite. diff -r fabf687df0ff -r e2da3ec94169 mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py Wed Sep 29 01:23:10 2021 +0200 +++ b/mercurial/pure/parsers.py Thu Sep 30 18:07:31 2021 +0200 @@ -102,6 +102,7 @@ msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' raise error.ProgrammingError(msg) + assert not (merged and not p1_tracked) self._wc_tracked = wc_tracked self._p1_tracked = p1_tracked self._p2_tracked = p2_tracked