--- a/tests/test-copies-unrelated.t Tue Jun 25 13:46:55 2019 -0700
+++ b/tests/test-copies-unrelated.t Tue Jun 25 14:25:03 2019 -0700
@@ -299,6 +299,8 @@
o 0 base
a
$ hg debugpathcopies 1 4
+ x -> y (no-filelog !)
+#if filelog
BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 2
grafting 2:* "modify x" (glob)
@@ -308,6 +310,11 @@
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
+#else
+ $ hg graft -r 2
+ grafting 2:* "modify x" (glob)
+ merging y and x to y
+#endif
$ hg co -qC 2
$ hg graft -r 4
grafting 4:* "rename x to y"* (glob)
@@ -345,6 +352,8 @@
o 0 base
a
$ hg debugpathcopies 1 5
+ x -> y (no-filelog !)
+#if filelog
BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 2
grafting 2:* "modify x" (glob)
@@ -354,6 +363,11 @@
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')
[255]
+#else
+ $ hg graft -r 2
+ grafting 2:* "modify x" (glob)
+ merging y and x to y
+#endif
$ hg co -qC 2
BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 5