Skip to content
Snippets Groups Projects
Commit e2da3ec9 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

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.
parent fabf687d
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment