equal
deleted
inserted
replaced
325 (no more unresolved files) |
325 (no more unresolved files) |
326 continue: hg rebase --continue |
326 continue: hg rebase --continue |
327 $ hg rebase --continue |
327 $ hg rebase --continue |
328 already rebased 1:27547f69f254 "B" as 45396c49d53b |
328 already rebased 1:27547f69f254 "B" as 45396c49d53b |
329 rebasing 2:965c486023db "C" |
329 rebasing 2:965c486023db "C" |
330 warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db |
330 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/27547f69f254-359abdd7-rebase.hg |
331 BROKEN: we should not have a merge commit here |
331 $ hg tglog |
332 $ hg tglog |
332 o 4: d2d25e26288e 'C' |
333 o 6: 567335b578a0 'C' |
333 | |
334 |\ |
334 o 3: 45396c49d53b 'B' |
335 | o 5: 45396c49d53b 'B' |
335 | |
336 | | |
336 @ 2: ae36e8e3dfd7 'E' |
337 | @ 4: ae36e8e3dfd7 'E' |
337 | |
338 | | |
338 o 1: 46b37eabc604 'D' |
339 | o 3: 46b37eabc604 'D' |
339 | |
340 | | |
|
341 o | 2: 965c486023db 'C' |
|
342 | | |
|
343 o | 1: 27547f69f254 'B' |
|
344 |/ |
|
345 o 0: 4a2df7238c3b 'A' |
340 o 0: 4a2df7238c3b 'A' |
346 |
341 |
347 $ cd .. |
342 $ cd .. |
348 |
343 |
349 (precommit version) |
344 (precommit version) |