Mercurial > evolve
comparison docs/sharing.rst @ 4921:a7c01a2a3974
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 07 Nov 2019 10:29:03 +0100 |
| parents | d1066fb2c95a |
| children | fff7ddbef685 |
comparison
equal
deleted
inserted
replaced
| 4918:f16274729530 | 4921:a7c01a2a3974 |
|---|---|
| 691 [figure SG07: 2:e011 now public not obsolete, 4:fe88 now phase-divergent] | 691 [figure SG07: 2:e011 now public not obsolete, 4:fe88 now phase-divergent] |
| 692 | 692 |
| 693 As usual when there's trouble in your repository, the solution is to | 693 As usual when there's trouble in your repository, the solution is to |
| 694 evolve it:: | 694 evolve it:: |
| 695 | 695 |
| 696 $ hg evolve --all | 696 $ hg evolve |
| 697 | 697 |
| 698 Figure 8 illustrates Bob's repository after evolving away the phase-divergent | 698 Figure 8 illustrates Bob's repository after evolving away the phase-divergent |
| 699 changeset. Ignoring the obsolete changesets, Bob now has a nice, | 699 changeset. Ignoring the obsolete changesets, Bob now has a nice, |
| 700 clean, simple history. His amendment of Alice's bug fix lives on, as | 700 clean, simple history. His amendment of Alice's bug fix lives on, as |
| 701 changeset 5:227d—albeit with a software-generated commit message. (Bob | 701 changeset 5:227d—albeit with a software-generated commit message. (Bob |