diff mercurial/patch.py @ 18606:95773237df7f

manifestmerge: handle abort on local unknown, remote created files This replaces the _checkunknown call in calculateupdates with a more performant version. On a repository with over 150,000 files, this speeds up an update by 0.6-0.8 seconds, which is up to 25%. This does not introduce any UI changes. There is existing test coverage for every case, mostly in test-merge*.t.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 09 Feb 2013 15:36:00 +0000
parents 242d2f4ec01c
children f0d55e1b4855
line wrap: on
line diff