Mercurial > hg
diff tests/test-graft.t @ 21980:f4e5753745e9
graft: make --force apply across continues (issue3220)
Since --force determines the list of revisions to be grafted, it doesn't really
make sense for users to have to keep typing --force --continue as they continue
grafting.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sat, 26 Jul 2014 14:54:36 -0700 |
parents | c2863cfe8a8a |
children | bdc0e04df243 |
line wrap: on
line diff
--- 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