44   requesting all changes

    44   requesting all changes

    45   adding changesets

    45   adding changesets

    46   adding manifests

    46   adding manifests

    47   adding file changes

    47   adding file changes

    48   added 1 changesets with 1 changes to 1 files

    48   added 1 changesets with 1 changes to 1 files

    50   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    49   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    51 

    50 

    52 Let's commit a preliminary change and push it to ``test-repo`` for

    51 Let's commit a preliminary change and push it to ``test-repo`` for

    53 testing. ::

    52 testing. ::

    54 

    53 

    86   adding manifests

    85   adding manifests

    87   adding file changes

    86   adding file changes

    88   added 1 changesets with 1 changes to 1 files (+1 heads)

    87   added 1 changesets with 1 changes to 1 files (+1 heads)

    89   1 new obsolescence markers

    88   1 new obsolescence markers

    90   obsoleted 1 changesets

    89   obsoleted 1 changesets

    92   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    90   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    93   updated to "60ffde5765c5: fix bug 37"

    91   updated to "60ffde5765c5: fix bug 37"

    94   1 other heads for branch "default"

    92   1 other heads for branch "default"

    95 

    93 

    96 Figure SG03

    94 Figure SG03

   351   adding changesets

   349   adding changesets

   352   adding manifests

   350   adding manifests

   353   adding file changes

   351   adding file changes

   354   added 1 changesets with 1 changes to 1 files (+1 heads)

   352   added 1 changesets with 1 changes to 1 files (+1 heads)

   355   2 new obsolescence markers

   353   2 new obsolescence markers

   357   (run 'hg heads' to see heads, 'hg merge' to merge)

   354   (run 'hg heads' to see heads, 'hg merge' to merge)

   358   $ hg log -G -q -r 'head()'

   355   $ hg log -G -q -r 'head()'

   359   o  4:540ba8f317e6

   356   o  4:540ba8f317e6

   360   |

   357   |

   361   ~

   358   ~

   455   searching for changes

   452   searching for changes

   456   adding changesets

   453   adding changesets

   457   adding manifests

   454   adding manifests

   458   adding file changes

   455   adding file changes

   459   added 1 changesets with 1 changes to 1 files

   456   added 1 changesets with 1 changes to 1 files

   461   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   457   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   462   $ echo 'better fix (alice)' >> file1

   458   $ echo 'better fix (alice)' >> file1

   463   $ hg amend -u alice -m 'fix bug 24 (v2 by alice)'

   459   $ hg amend -u alice -m 'fix bug 24 (v2 by alice)'

   464 

   460 

   465 Bob implements a better fix of his own::

   461 Bob implements a better fix of his own::

   483   adding changesets

   479   adding changesets

   484   adding manifests

   480   adding manifests

   485   adding file changes

   481   adding file changes

   486   added 1 changesets with 1 changes to 1 files (+1 heads)

   482   added 1 changesets with 1 changes to 1 files (+1 heads)

   487   1 new obsolescence markers

   483   1 new obsolescence markers

   489   (run 'hg heads' to see heads, 'hg merge' to merge)

   484   (run 'hg heads' to see heads, 'hg merge' to merge)

   490   2 new content-divergent changesets

   485   2 new content-divergent changesets

   491 

   486 

   492 Figure SG09: multiple heads! divergence! oh my!

   487 Figure SG09: multiple heads! divergence! oh my!

   493   $ hg --hidden shortlog -G -r 3::

   488   $ hg --hidden shortlog -G -r 3::