Mercurial > hg-stable

changeset 48125:e2da3ec94169

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 30 Sep 2021 18:07:31 +0200
parents fabf687df0ff
children 73bcfde21fc2
files mercurial/pure/parsers.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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