Mercurial > hg
diff tests/test-graft.t @ 21979:c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 25 Jul 2014 18:21:16 -0700 |
parents | b081decd9062 |
children | f4e5753745e9 |
line wrap: on
line diff
--- a/tests/test-graft.t Fri Jul 04 19:52:39 2014 +0200 +++ b/tests/test-graft.t Fri Jul 25 18:21:16 2014 -0700 @@ -631,3 +631,33 @@ grafting revision 13 grafting revision 19 merging b + +graft with --force (still doesn't graft merges) + + $ hg graft 19 0 6 + skipping ungraftable merge revision 6 + skipping ancestor revision 0 + skipping already grafted revision 19 (22 also has origin 2) + [255] + $ hg graft 19 0 6 --force + skipping ungraftable merge revision 6 + grafting revision 19 + merging b + grafting revision 0 + +graft --force after backout + + $ echo abc > a + $ hg ci -m 28 + $ hg backout 28 + reverting a + changeset 29:484c03b8dfa4 backs out changeset 28:6c56f0f7f033 + $ hg graft 28 + skipping ancestor revision 28 + [255] + $ hg graft 28 --force + grafting revision 28 + merging a + $ cat a + abc +