Mercurial > public > mercurial-scm > hg
diff tests/test-graft.t @ 15508:00276525e2b7 stable
graft: disallow grafting grafted csets in specific situations (issue3091)
In particular, we do not allow:
- grafting an already grafted cset onto its original branch
- grafting already grafted csets with the same origin onto each other
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Sat, 12 Nov 2011 14:00:25 +0100 |
| parents | 7186b54b07c6 |
| children | 646759147717 |
line wrap: on
line diff
--- a/tests/test-graft.t Sat Nov 12 11:23:52 2011 +0100 +++ b/tests/test-graft.t Sat Nov 12 14:00:25 2011 +0100 @@ -255,3 +255,25 @@ 2 +Disallow grafting an already grafted cset onto its original branch + $ hg up -q 6 + $ hg graft 7 + skipping already grafted revision 7 (was grafted from 2) + [255] + +Disallow grafting already grafted csets with the same origin onto each other + $ hg up -q 13 + $ hg graft 2 + skipping already grafted revision 2 + [255] + $ hg graft 7 + skipping already grafted revision 7 (same origin 2) + [255] + + $ hg up -q 7 + $ hg graft 2 + skipping already grafted revision 2 + [255] + $ hg graft tip + skipping already grafted revision 13 (same origin 2) + [255]