Mercurial > evolve
changeset 2862:07ce6c063c61
doc: typo fixes
| author | Philippe Pepiot <phil@philpep.org> |
|---|---|
| date | Tue, 29 Aug 2017 12:18:42 +0200 |
| parents | 54a95c333102 |
| children | 3e3a276c9e91 |
| files | docs/obs-terms.rst docs/sharing.rst |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/obs-terms.rst Tue Aug 29 12:17:48 2017 +0200 +++ b/docs/obs-terms.rst Tue Aug 29 12:18:42 2017 +0200 @@ -145,7 +145,7 @@ | | | conflict) | | | | | | | | (possible alternative names:| -| | | clashing, rival, concurent, | +| | | clashing, rival, concurrent,| | | | conflicting) | | | | | | +--------------------------+-----------------------------+ @@ -231,7 +231,7 @@ This is an important name as hg pull/push will suggest it the same way it suggest merging when you add heads. -alternative names: +Alternative names: - solve (too generic ?) - stabilize
--- a/docs/sharing.rst Tue Aug 29 12:17:48 2017 +0200 +++ b/docs/sharing.rst Tue Aug 29 12:18:42 2017 +0200 @@ -203,7 +203,7 @@ As seen in figure 3, this transfers the new changeset *and* the obsolescence marker for revision 1. However, it does *not* transfer the temporary amend commit, because it is hidden. Push and pull -transfer obsolesence markers between repositories, but they do not +transfer obsolescence markers between repositories, but they do not transfer hidden changesets. [figure SG03: dev-repo grows new rev 2:60ff, marks 1:f649 obsolete] @@ -699,7 +699,7 @@ $ hg evolve --all -Figure 8 illustrate's Bob's repository after evolving away the bumped +Figure 8 illustrates Bob's repository after evolving away the bumped changeset. Ignoring the obsolete changesets, Bob now has a nice, clean, simple history. His amendment of Alice's bug fix lives on, as changeset 5:227d—albeit with a software-generated commit message. (Bob