equal
deleted
inserted
replaced
100 ): |
100 ): |
101 if merged and (clean_p1 or clean_p2): |
101 if merged and (clean_p1 or clean_p2): |
102 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |
102 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |
103 raise error.ProgrammingError(msg) |
103 raise error.ProgrammingError(msg) |
104 |
104 |
|
105 assert not (merged and not p1_tracked) |
105 self._wc_tracked = wc_tracked |
106 self._wc_tracked = wc_tracked |
106 self._p1_tracked = p1_tracked |
107 self._p1_tracked = p1_tracked |
107 self._p2_tracked = p2_tracked |
108 self._p2_tracked = p2_tracked |
108 self._merged = merged |
109 self._merged = merged |
109 self._clean_p1 = clean_p1 |
110 self._clean_p1 = clean_p1 |