--- a/tests/test-copies-unrelated.t Tue Jun 25 14:25:03 2019 -0700
+++ b/tests/test-copies-unrelated.t Fri Jun 28 12:59:21 2019 -0700
@@ -299,22 +299,10 @@
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)
- file 'x' was deleted in local [local] but was modified in other [graft].
- What do you want to do?
- use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- abort: unresolved conflicts, can't continue
- (use 'hg resolve' and 'hg graft --continue')
- [255]
-#else
+ x -> y
$ 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)