equal
deleted
inserted
replaced
173 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
173 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
174 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
174 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
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" |
182 $ hg debugobsolete |
182 $ hg debugobsolete |
183 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
183 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
270 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a |
270 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a |
271 description: |
271 description: |
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 |
278 --------------------------------- |
291 --------------------------------- |
279 |
292 |