Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs/user-guide.rst
changeset 4626 561e97db1cf7
parent 4621 8784dfc6537c
child 4919 8beb44234b33 
--- a/docs/user-guide.rst	Sat Apr 27 22:45:16 2019 -0400
+++ b/docs/user-guide.rst	Sun Apr 28 00:21:28 2019 -0400
@@ -239,10 +239,7 @@
 .. figure:: figures/figure-ug02.svg
 
    Figure 2: safe history modification using ``evolve``: the original
-   revision 1 is preserved as an obsolete changeset. (The "temporary
-   amend commit", marked with T, is an implementation detail stemming
-   from limitations in Mercurial's current merge machinery. Future
-   versions of Mercurial will not create them.)
+   revision 1 is preserved as an obsolete changeset.
 
 In this case, the obsolete changesets are also *hidden*. That is the
 usual end state for obsolete changesets. However, many scenarios result
@@ -256,21 +253,19 @@
 
 As the name implies, hidden changesets are normally not visible. If
 you run ``hg log`` on the repository from Figure 2, Mercurial will
-show revisions 0 and 3, but not 1 and 2. That's something you don't
+show revisions 0 and 2, but not 1. That's something you don't
 see with plain vanilla Mercurial—normally, revision *N* is always
 followed by revision *N* + 1.
 
 This is just the visible manifestation of hidden changesets. If
-revision 0 is followed by revision 3, that means there are two hidden
-changesets, 1 and 2, in between.
+revision 0 is followed by revision 2, that means there is a hidden
+changeset, (1) in between.
 
 To see those hidden changesets, use the ``--hidden`` option::
 
   $ hg --hidden log --graph --template '{rev}:{node|short}  {desc|firstline}\n'
-  @  3:934359450037  implement feature Y
+  @  2:934359450037  implement feature Y
   |
-  | x  2:6c5f78d5d467  temporary amend commit for fe0ecd3bd2a4
-  | |
   | x  1:fe0ecd3bd2a4  implement feature Y
   |/
   o  0:08c4b6f4efc8  init
@@ -399,8 +394,7 @@
 
    Figure 6: amending a changeset with descendants means the amended
    changeset is obsolete but remains visible; its non-obsolete
-   descendants are *orphan*. The temporary amend commit, revision
-   14, is hidden because it has no non-obsolete descendants.
+   descendants are *orphan*.
 
 All non-obsolete descendants of an obsolete changeset are considered
 orphans. An interesting consequence of this is that revision 11 is
@@ -420,7 +414,7 @@
 
 The end state, after ``evolve`` finishes, is that the original
 revisions (11-13) are obsolete and hidden. Their successor revisions
-(15-17) replace them.
+(14-16) replace them.
 
 .. figure:: figures/figure-ug07.svg
evolve