facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity

tests: demonstrate broken rebase from obsolete commit

Browse Source 
This shows the bug I reported in issue 5219.
This commit is contained in:
Martin von Zweigbergk 2017-02-01 09:18:44 -08:00
parent 2971a9e1cb
commit 95e6286750
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test-rebase-obsolete.t
View File

@ -175,7 +175,7 @@ set.
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) 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)' $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
rebasing 9:08483444fef9 "D" rebasing 9:08483444fef9 "D"
@ -272,6 +272,19 @@ More complex case were part of the rebase set were already rebased
D 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 .. $ cd ..
collapse rebase collapse rebase