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