equal
deleted
inserted
replaced
308 $ echo more >> unrelated |
308 $ echo more >> unrelated |
309 $ hg ci -m 'unrelated commit is unrelated' |
309 $ hg ci -m 'unrelated commit is unrelated' |
310 created new head |
310 created new head |
311 $ hg rebase -s 2 --dest 5 --collapse |
311 $ hg rebase -s 2 --dest 5 --collapse |
312 rebasing 2:68bf06433839 "File b created as copy of a and modified" |
312 rebasing 2:68bf06433839 "File b created as copy of a and modified" |
|
313 note: rebase of 2:68bf06433839 created no changes to commit |
313 rebasing 3:af74b229bc02 "File c created as copy of b and modified" |
314 rebasing 3:af74b229bc02 "File c created as copy of b and modified" |
314 merging b and c to c |
315 merging b and c to c |
|
316 note: rebase of 3:af74b229bc02 created no changes to commit |
315 rebasing 4:dbb9ba033561 "File d created as copy of c and modified" |
317 rebasing 4:dbb9ba033561 "File d created as copy of c and modified" |
316 merging c and d to d |
318 merging c and d to d |
|
319 note: rebase of 4:dbb9ba033561 created no changes to commit |
317 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-backup.hg (glob) |
320 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-backup.hg (glob) |
318 $ hg co tip |
321 $ hg co tip |
319 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
322 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
320 |
323 |
321 This should show both revision 3 and 0 since 'd' was transitively a |
324 This should show both revision 3 and 0 since 'd' was transitively a |