##// END OF EJS Templates
tests: demonstrate broken rebase from obsolete commit...
Martin von Zweigbergk -
r31295:7f869d81 default
parent child Browse files
Show More
@@ -175,7 +175,7 b' set.'
175 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
175 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
176
176
177
177
178 More complex case were part of the rebase set were already rebased
178 More complex case where part of the rebase set were already rebased
179
179
180 $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
180 $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
181 rebasing 9:08483444fef9 "D"
181 rebasing 9:08483444fef9 "D"
@@ -272,6 +272,19 b' More complex case were part of the rebas'
272 D
272 D
273
273
274
274
275 Start rebase from a commit that is obsolete but not hidden only because it's
276 a working copy parent. We should be moved back to the starting commit as usual
277 even though it is hidden (until we're moved there).
278
279 $ hg --hidden up -qr 'first(hidden())'
280 $ hg rebase --rev 13 --dest 15
281 rebasing 13:98f6af4ee953 "C"
282 transaction abort!
283 rollback completed
284 abort: hidden revision '1'!
285 (use --hidden to access hidden revisions)
286 [255]
287
275 $ cd ..
288 $ cd ..
276
289
277 collapse rebase
290 collapse rebase
General Comments 0
You need to be logged in to leave comments. Login now