561         other processing.

   561         other processing.

   562         """

   562         """

   563         if merged and (clean_p1 or clean_p2):

   563         if merged and (clean_p1 or clean_p2):

   564             msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'

   564             msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'

   565             raise error.ProgrammingError(msg)

   565             raise error.ProgrammingError(msg)

   567         if not (p1_tracked or p2_tracked or wc_tracked):

   566         if not (p1_tracked or p2_tracked or wc_tracked):

   568             self._drop(filename)

   567             self._drop(filename)

   569         elif merged:

   568         elif merged:

   570             assert wc_tracked

   569             assert wc_tracked

   571             if not self.in_merge:

   570             if not self.in_merge: