dirstatemap: use the default code to handle "p2-tracked" case

We juste have to do minor value adjustement and the default code will do the rest.

This kind of change highglight that "clean_p2" is probably not the right name,
for that value. However this is all thing to be figured out and cleaned up once
are done moving logic at lower level.

Differential Revision: https://phab.mercurial-scm.org/D11325

mercurial/dirstatemap.py

@@ -295,8 +295,7 b' class dirstatemap(object):'
                 self.addfile(filename, from_p2=True)
                 return
         elif not p1_tracked and p2_tracked and wc_tracked:
-            self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
-            return
+            clean_p2 = True
         elif possibly_dirty:
             pass
         elif wc_tracked: