[PATCH 0 of 3] merge speedup with lots of merged files

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Fri Jun 18 02:36:44 CDT 2010


This patch series improves the performance of the example raised on the ML
where we modify all files in hg on two different heads, then merge. It is
down from about 70s to about 4s on my SSD now (git is reported to take about
1s).

There might still be some opportunity for speedup during the actual file
merges. I haven't looked into those.

The delayed write of the mergestate during applyupdates is based on the
assumption that there cannot be any external hooks requiring an updated
mergestate on disk during this phase.


More information about the Mercurial-devel mailing list