Mercurial > public > mercurial-scm > hg-stable

diff tests/test-pathconflicts-basic.t @ 34942: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
parents 7a8a16f8ea22
children 41ef02ba329b
line wrap: on
line diff
--- a/tests/test-pathconflicts-basic.t	Tue Oct 24 11:14:38 2017 -0700
+++ b/tests/test-pathconflicts-basic.t	Tue Oct 24 11:15:30 2017 -0700
@@ -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
@@ -96,4 +104,3 @@
   commit: (clean)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 4 draft
-