5 Commits

Author	SHA1	Message	Date
Jun Wu	7fa918cefd	perftweaks: move commit head detection removal logic to core ... Summary: Also change the internal API so it no longer accepts the "heads" argument. Reviewed By: ryanmce Differential Revision: D6745865 fbshipit-source-id: 368742be49b192f7630421003552d0a10eb0b76d	2018-04-13 21:50:52 -07:00
Siddharth Agarwal	2d9d1fcc19	merge: disable path conflict checking by default (issue5716) ... We shouldn't ship a severe perf regression in hg update for 4.4. Differential Revision: https://phab.mercurial-scm.org/D1223	2017-10-24 11:15:30 -07:00
Matt Harbison	f3e987661c	test-conflicts: conditionalize for no-symlink platforms ... It seems better to create standin files for the symlinks, rather than blacklist the entire tests. Especially since link vs file doesn't seem to affect the tests. There is more instability in test-pathconflicts-{basic,merge}.t that I can't figure out.	2017-10-14 01:07:59 -04:00
Augie Fackler	fa984aa77e	tests: use readlink.py instead of readlink ... The latter doesn't always exist, such as on Solaris-derived platforms. Differential Revision: https://phab.mercurial-scm.org/D999	2017-10-10 11:03:14 -04:00
Mark Thomas	a75bef4867	tests: add test for path conflicts during update ... Differential Revision: https://phab.mercurial-scm.org/D786	2017-10-02 14:05:30 -07:00