Mercurial > evolve
changeset 4936:deec516b6e34 stable
docs: add some up-to-date output from push/pull commands
Hopefully it's going to be helpful for users to better understand how evolve
works.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 11 Nov 2019 03:22:09 +0700 |
| parents | 3874bc10d4a7 |
| children | 0d1893c1044c |
| files | docs/sharing.rst |
| diffstat | 1 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/sharing.rst Mon Nov 11 02:42:37 2019 +0700 +++ b/docs/sharing.rst Mon Nov 11 03:22:09 2019 +0700 @@ -206,7 +206,12 @@ $ hg pull -u [...] added 1 changesets with 1 changes to 1 files (+1 heads) + 2 new obsolescence markers + obsoleted 1 changesets + new changesets 522d503432a2 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "522d503432a2: fix bug 37" + 1 other heads for branch "default" As seen in figure 3, this transfers the new changeset *and* the obsolescence marker for revision 1. However, it does *not* transfer @@ -252,6 +257,7 @@ $ hg push [...] added 1 changesets with 1 changes to 1 files + 4 new obsolescence markers Note that only one changeset—the final version, after all the amendments—was actually pushed. Again, Mercurial doesn't transfer @@ -390,6 +396,8 @@ $ hg push [...] added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers + obsoleted 1 changesets updating bookmark bug15 Figure 6 shows the state of the ``review`` repository at this point. @@ -424,6 +432,8 @@ $ hg push [...] added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers + obsoleted 1 changesets updating bookmark featureX Unfortunately, that still doesn't pass muster. Bob's reviewer insists @@ -438,6 +448,7 @@ $ hg push ../public [...] added 1 changesets with 1 changes to 1 files + 2 new obsolescence markers It's not enough just to update ``public``, though! Other people also use the ``review`` repository, and right now it doesn't have Bob's @@ -448,6 +459,8 @@ $ hg push ../review [...] added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers + obsoleted 1 changesets updating bookmark featureX Figure 7 shows the result of Bob's work in both ``review`` and @@ -499,9 +512,12 @@ $ hg push ../public [...] added 1 changesets with 1 changes to 1 files + 2 new obsolescence markers $ hg push ../review [...] - added 1 changesets with 0 changes to 0 files + added 1 changesets with 0 changes to 1 files + 1 new obsolescence markers + obsoleted 1 changesets updating bookmark bug15 The result, in both ``review`` and ``public`` repositories, is shown @@ -603,9 +619,11 @@ $ hg pull ../alice [...] - added 1 changesets with 1 changes to 2 files (+1 heads) + added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers + 2 new content-divergent changesets + new changesets e3a586fd2377 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) - 2 new content-divergent changesets Figure 9 shows the situation in Bob's repository.