D1710: tests: test-pathconflicts-merge.t requires symlinks

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Fri Dec 15 22:53:54 UTC 2017


durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Once we're ready to turn this functionality on more widely, we might
  want to write a symlink-free version of the test that can run on
  Windows, but for now we'll just leave it disabled there.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1710

AFFECTED FILES
  tests/test-pathconflicts-merge.t

CHANGE DETAILS

diff --git a/tests/test-pathconflicts-merge.t b/tests/test-pathconflicts-merge.t
--- a/tests/test-pathconflicts-merge.t
+++ b/tests/test-pathconflicts-merge.t
@@ -1,3 +1,5 @@
+#require symlink
+
 Path conflict checking is currently disabled by default because of issue5716.
 Turn it on for this test.
 



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list