Mercurial > hg
changeset 31295:7f869d81ab54
tests: demonstrate broken rebase from obsolete commit
This shows the bug I reported in issue 5219.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 01 Feb 2017 09:18:44 -0800 |
| parents | c134a33b1d73 |
| children | 98658f73588a |
| files | tests/test-rebase-obsolete.t |
| diffstat | 1 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Wed Mar 01 16:19:41 2017 -0800 +++ b/tests/test-rebase-obsolete.t Wed Feb 01 09:18:44 2017 -0800 @@ -175,7 +175,7 @@ 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) -More complex case were part of the rebase set were already rebased +More complex case where part of the rebase set were already rebased $ hg rebase --rev 'desc(D)' --dest 'desc(H)' rebasing 9:08483444fef9 "D" @@ -272,6 +272,19 @@ D +Start rebase from a commit that is obsolete but not hidden only because it's +a working copy parent. We should be moved back to the starting commit as usual +even though it is hidden (until we're moved there). + + $ hg --hidden up -qr 'first(hidden())' + $ hg rebase --rev 13 --dest 15 + rebasing 13:98f6af4ee953 "C" + transaction abort! + rollback completed + abort: hidden revision '1'! + (use --hidden to access hidden revisions) + [255] + $ cd .. collapse rebase