comparison mercurial/patch.py @ 18650:de0bd4bfc6d7

merge: run _forgetremoved after manifestmerge _forgetremoved can trigger manifest construction, but we only want it to happen after manifestmerge, so that our attempt to read the manifests in the right order in an upcoming patch actually works.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 10 Feb 2013 12:16:46 +0000
parents 242d2f4ec01c
children f0d55e1b4855
comparison
equal deleted inserted replaced
18649:0969980308c7 18650:de0bd4bfc6d7