Mercurial > evolve
changeset 4932:fff7ddbef685 stable
docs: correct node hashes in sharing.rst based on test-sharing.t
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 26 Oct 2019 13:33:05 +0700 |
| parents | 6408d7a01b59 |
| children | 3e748357a055 |
| files | docs/sharing.rst |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/sharing.rst Sat Oct 26 13:30:21 2019 +0700 +++ b/docs/sharing.rst Sat Oct 26 13:33:05 2019 +0700 @@ -385,7 +385,7 @@ Figure 6 shows the state of the ``review`` repository at this point. - [figure SG06: rev 2:fn1e is Alice's obsolete v1, rev 3:cbdf is her v2; both children of rev 1:de61] + [figure SG06: rev 2:f91e is Alice's obsolete v1, rev 3:cbdf is her v2; both children of rev 1:de61] After a busy morning of bug fixing, Alice stops for lunch. Let's see what Bob has been up to. @@ -401,7 +401,7 @@ $ cd ../bob $ echo 'stuff' > file1 $ hg bookmark featureX - $ hg commit -u bob -m 'implement feature X (v1)' # rev 4:1636 + $ hg commit -u bob -m 'implement feature X (v1)' # rev 4:1936 $ hg push -B featureX [...] added 1 changesets with 1 changes to 1 files (+1 heads) @@ -613,7 +613,7 @@ Figure 10 shows how Bob's repository looks now. - [figure SG10: only one visible head, 9:5ad6, successor to hidden 6:a360 and 7:e3f9] + [figure SG10: only one visible head, 9:b149, successor to hidden 6:a360 and 7:e3f9] We carefully dodged a merge conflict by specifying a merge tool (``internal:other``) that will take Alice's changes over Bob's. (You