509 merge:[5] fix bug 24 (v2 by bob) |
509 merge:[5] fix bug 24 (v2 by bob) |
510 with: [6] fix bug 24 (v2 by alice) |
510 with: [6] fix bug 24 (v2 by alice) |
511 base: [4] fix bug 24 (v1) |
511 base: [4] fix bug 24 (v1) |
512 merging "other" content-divergent changeset 'e3f99ce9d9cd' |
512 merging "other" content-divergent changeset 'e3f99ce9d9cd' |
513 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
513 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
514 working directory is now at 711ede2d7a26 |
514 working directory is now at 5ad6037c046c |
515 $ hg log -q -r 'contentdivergent()' |
515 $ hg log -q -r 'contentdivergent()' |
516 |
516 |
517 Figure SG10: Bob's repository after fixing divergence. |
517 Figure SG10: Bob's repository after fixing divergence. |
518 $ hg --hidden shortlog -G -r 3:: |
518 $ hg --hidden shortlog -G -r 3:: |
519 @ 7:711ede2d7a26 draft fix bug 24 (v2 by bob) |
519 @ 7:5ad6037c046c draft fix bug 24 (v2 by bob) |
520 | |
520 | |
521 | x 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
521 | x 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
522 |/ |
522 |/ |
523 | x 5:a360947f6faf draft fix bug 24 (v2 by bob) |
523 | x 5:a360947f6faf draft fix bug 24 (v2 by bob) |
524 |/ |
524 |/ |
525 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) |
525 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) |
526 |/ |
526 |/ |
527 o 3:a06ec1bf97bd public fix bug 15 (v2) |
527 o 3:a06ec1bf97bd public fix bug 15 (v2) |
528 | |
528 | |
529 ~ |
529 ~ |
530 $ hg --hidden shortlog -r 'precursors(711ede2d7a26)' |
530 $ hg --hidden shortlog -r 'precursors(5ad6037c046c)' |
531 5:a360947f6faf draft fix bug 24 (v2 by bob) |
531 5:a360947f6faf draft fix bug 24 (v2 by bob) |
532 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
532 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
533 $ cat file1 |
533 $ cat file1 |
534 Do stuff. |
534 Do stuff. |
535 pretty good fix |
535 pretty good fix |