tests/test-graft.t
changeset 21980 f4e5753745e9
parent 21979 c2863cfe8a8a
child 22305 bdc0e04df243
--- a/tests/test-graft.t	Fri Jul 25 18:21:16 2014 -0700
+++ b/tests/test-graft.t	Sat Jul 26 14:54:36 2014 -0700
@@ -661,3 +661,20 @@
   $ cat a
   abc
 
+graft --continue after --force
+
+  $ hg backout 30
+  reverting a
+  changeset 31:3b96c18b7a1b backs out changeset 30:8f539994be33
+  $ hg graft 28 --force --tool internal:fail
+  grafting revision 28
+  abort: unresolved conflicts, can't continue
+  (use hg resolve and hg graft --continue)
+  [255]
+  $ hg resolve --all
+  merging a
+  (no more unresolved files)
+  $ hg graft -c
+  grafting revision 28
+  $ cat a
+  abc