296                 return

   296                 return

   297         elif not p1_tracked and p2_tracked and wc_tracked:

   297         elif not p1_tracked and p2_tracked and wc_tracked:

   298             self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)

   298             self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)

   299             return

   299             return

   300         elif possibly_dirty:

   300         elif possibly_dirty:

   303         elif wc_tracked:

   302         elif wc_tracked:

   304             # this is a "normal" file

   303             # this is a "normal" file

   305             if parentfiledata is None:

   304             if parentfiledata is None:

   306                 msg = b'failed to pass parentfiledata for a normal file: %s'

   305                 msg = b'failed to pass parentfiledata for a normal file: %s'

   307                 msg %= filename

   306                 msg %= filename