Mercurial > hg > mercurial-source

diff tests/test-pathconflicts-merge.t @ 35725:2a774cae3a03 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Siddharth Agarwal <sid0@fb.com>
date Tue, 24 Oct 2017 11:15:30 -0700 (2017-10-24)
parents 75bd034a1e00
children 4441705b7111
line wrap: on
line diff
--- a/tests/test-pathconflicts-merge.t
+++ b/tests/test-pathconflicts-merge.t
@@ -1,3 +1,11 @@
+Path conflict checking is currently disabled by default because of issue5716.
+Turn it on for this test.
+
+  $ cat >> $HGRCPATH << EOF
+  > [experimental]
+  > merge.checkpathconflicts=True
+  > EOF
+
   $ hg init repo
   $ cd repo
   $ echo base > base