Mercurial > evolve

comparison docs/sharing.rst @ 2862:07ce6c063c61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: typo fixes
author Philippe Pepiot <phil@philpep.org>
date Tue, 29 Aug 2017 12:18:42 +0200
parents a35f6b1e4a41
children 3e3a276c9e91
comparison
equal deleted inserted replaced
2861:54a95c333102 2862:07ce6c063c61
201 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 201 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
202 202
203 As seen in figure 3, this transfers the new changeset *and* the 203 As seen in figure 3, this transfers the new changeset *and* the
204 obsolescence marker for revision 1. However, it does *not* transfer 204 obsolescence marker for revision 1. However, it does *not* transfer
205 the temporary amend commit, because it is hidden. Push and pull 205 the temporary amend commit, because it is hidden. Push and pull
206 transfer obsolesence markers between repositories, but they do not 206 transfer obsolescence markers between repositories, but they do not
207 transfer hidden changesets. 207 transfer hidden changesets.
208 208
209 [figure SG03: dev-repo grows new rev 2:60ff, marks 1:f649 obsolete] 209 [figure SG03: dev-repo grows new rev 2:60ff, marks 1:f649 obsolete]
210 210
211 Because of this deliberately incomplete synchronization, revision 211 Because of this deliberately incomplete synchronization, revision
697 As usual when there's trouble in your repository, the solution is to 697 As usual when there's trouble in your repository, the solution is to
698 evolve it:: 698 evolve it::
699 699
700 $ hg evolve --all 700 $ hg evolve --all
701 701
702 Figure 8 illustrate's Bob's repository after evolving away the bumped 702 Figure 8 illustrates Bob's repository after evolving away the bumped
703 changeset. Ignoring the obsolete changesets, Bob now has a nice, 703 changeset. Ignoring the obsolete changesets, Bob now has a nice,
704 clean, simple history. His amendment of Alice's bug fix lives on, as 704 clean, simple history. His amendment of Alice's bug fix lives on, as
705 changeset 5:227d—albeit with a software-generated commit message. (Bob 705 changeset 5:227d—albeit with a software-generated commit message. (Bob
706 should probably amend that changeset to improve the commit message.) 706 should probably amend that changeset to improve the commit message.)
707 But the important thing is that his repository no longer has any 707 But the important thing is that his repository no longer has any