[PATCH 14 of 14 evolve-ext] docs: drop references to the old temporary commit that was created with amend

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu May 2 17:54:24 EDT 2019


All these but patch 9 have been pushed, many thanks for updating this.


(see comment on patch 9)

On 4/28/19 6:29 AM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1556425288 14400
> #      Sun Apr 28 00:21:28 2019 -0400
> # Node ID 5c913f7081b36f71c3678f3686f89d5365e7bdeb
> # Parent  b7745c93b5d9b7d16a7bd5d2a1ef50d3920763a2
> docs: drop references to the old temporary commit that was created with amend
> 
> The sharing.rst page also mentions amend, but the diagrams aren't showing, so
> I'm not sure if they're in some other repo and needing to be updated.
> 
> diff --git a/docs/figures/figure-ug02.svg b/docs/figures/figure-ug02.svg
> --- a/docs/figures/figure-ug02.svg
> +++ b/docs/figures/figure-ug02.svg
> @@ -206,14 +206,14 @@
>        inkscape:pageshadow="2"
>        inkscape:zoom="3.7318511"
>        inkscape:cx="113.8845"
> -     inkscape:cy="138.3052"
> +     inkscape:cy="132.4403"
>        inkscape:document-units="px"
>        inkscape:current-layer="svg2"
>        showgrid="false"
> -     inkscape:window-width="1032"
> -     inkscape:window-height="710"
> -     inkscape:window-x="224"
> -     inkscape:window-y="33"
> +     inkscape:window-width="1814"
> +     inkscape:window-height="950"
> +     inkscape:window-x="68"
> +     inkscape:window-y="45"
>        inkscape:window-maximized="0"
>        showguides="false"
>        inkscape:snap-global="false"
> @@ -348,7 +348,7 @@
>            x="67.447083"
>            id="tspan3914"
>            sodipodi:role="line"
> -         style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">3</tspan></text>
> +         style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">2</tspan></text>
>     </g>
>     <path
>        style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-6)"
> @@ -431,41 +431,6 @@
>          x="122.10091"
>          y="140.49216"
>          style="font-size:10px;line-height:1.25;font-family:sans-serif"> </tspan></text>
> -  <g
> -     id="g5472"
> -     transform="translate(1.9995778e-6,1.240699)">
> -    <rect
> -       y="135.44673"
> -       x="120.5"
> -       height="18.05327"
> -       width="21.481739"
> -       id="rect2987-4-0-0"
> -       style="fill:none;stroke:#404040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 3;stroke-dashoffset:0" />
> -    <text
> -       inkscape:transform-center-x="2.6044813"
> -       transform="scale(0.9999979,1.0000021)"
> -       id="text5217-8-9-2"
> -       y="148.84123"
> -       x="127.4267"
> -       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#404040;fill-opacity:1;stroke:none"
> -       xml:space="preserve"><tspan
> -         id="tspan6156-7-4"
> -         sodipodi:role="line"
> -         x="127.4267"
> -         y="148.84123"
> -         style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">2</tspan></text>
> -  </g>
> -  <text
> -     xml:space="preserve"
> -     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
> -     x="140.76923"
> -     y="136.65099"
> -     id="text4119"><tspan
> -       sodipodi:role="line"
> -       id="tspan4121"
> -       x="140.76923"
> -       y="136.65099"
> -       style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">T</tspan></text>
>     <path
>        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 3;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#DotM)"
>        d="m 71.240874,154.7407 v 52.70603"
> @@ -479,27 +444,6 @@
>     <text
>        xml:space="preserve"
>        style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
> -     x="175.07857"
> -     y="112.16577"
> -     id="text4787"><tspan
> -       sodipodi:role="line"
> -       x="175.07857"
> -       y="112.16577"
> -       id="tspan4791"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">temporary</tspan><tspan
> -       sodipodi:role="line"
> -       x="175.07857"
> -       y="122.16577"
> -       id="tspan4795"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">amend</tspan><tspan
> -       sodipodi:role="line"
> -       x="175.07857"
> -       y="132.16577"
> -       id="tspan4797"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">commit</tspan></text>
> -  <text
> -     xml:space="preserve"
> -     style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
>        x="51.716301"
>        y="112.74194"
>        id="text4799"><tspan
> @@ -541,20 +485,10 @@
>        id="path5263"
>        inkscape:connector-curvature="0" />
>     <path
> -     style="fill:none;stroke:#707070;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
> -     d="m 173.06037,115.51697 c -10.90807,9.681 -3.90454,20.30854 -25.22746,18.66832"
> -     id="path5689"
> -     inkscape:connector-curvature="0" />
> -  <path
>        style="color:#000000;fill:none;stroke:#707070;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow2Mend-2);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
>        d="m 97.377997,116.02152 c 1.765752,12.09244 -25.911587,2.23195 -29.768403,17.65922"
>        id="path5893"
>        inkscape:connector-curvature="0" />
> -  <path
> -     style="color:#000000;fill:none;stroke:#707070;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow2Mend-2);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
> -     d="m 99.093394,115.78744 c -1.76575,12.09244 25.911586,2.23195 29.768406,17.65922"
> -     id="path5893-7"
> -     inkscape:connector-curvature="0" />
>     <g
>        id="g6493"
>        transform="translate(1.9995778e-6,1.240701)">
> @@ -578,14 +512,4 @@
>            inkscape:connector-curvature="0" />
>       </g>
>     </g>
> -  <path
> -     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
> -     d="m 81.981743,145.71407 38.518257,0"
> -     id="path3069"
> -     inkscape:connector-type="polyline"
> -     inkscape:connector-curvature="0"
> -     inkscape:connection-start="#g4022"
> -     inkscape:connection-start-point="d4"
> -     inkscape:connection-end="#g5472"
> -     inkscape:connection-end-point="d4" />
>   </svg>
> diff --git a/docs/figures/figure-ug06.svg b/docs/figures/figure-ug06.svg
> --- a/docs/figures/figure-ug06.svg
> +++ b/docs/figures/figure-ug06.svg
> @@ -331,15 +331,15 @@
>        inkscape:pageopacity="0.0"
>        inkscape:pageshadow="2"
>        inkscape:zoom="2"
> -     inkscape:cx="124.00649"
> +     inkscape:cx="126.00649"
>        inkscape:cy="153.46969"
>        inkscape:document-units="px"
>        inkscape:current-layer="svg2"
>        showgrid="false"
> -     inkscape:window-width="974"
> -     inkscape:window-height="1048"
> -     inkscape:window-x="48"
> -     inkscape:window-y="61"
> +     inkscape:window-width="1814"
> +     inkscape:window-height="950"
> +     inkscape:window-x="77"
> +     inkscape:window-y="62"
>        inkscape:window-maximized="0"
>        showguides="false"
>        inkscape:snap-global="false"
> @@ -496,7 +496,7 @@
>          id="tspan3914"
>          x="63.342594"
>          y="266.20969"
> -       style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">15</tspan></text>
> +       style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14</tspan></text>
>     <path
>        style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-6)"
>        d="m 18.241201,193.5 45.999463,59.31546"
> @@ -753,82 +753,6 @@
>        d="m 174.94201,152.58423 c 1.6786,11.87585 15.90381,0.83843 15.90381,15.90382"
>        id="path5104"
>        inkscape:connector-curvature="0" />
> -  <g
> -     id="g5631"
> -     transform="translate(-27.905601,-5.4032307)">
> -    <rect
> -       y="211.84996"
> -       x="118.4056"
> -       height="18.05327"
> -       width="21.481739"
> -       id="rect2987-4-0-0"
> -       style="fill:none;stroke:#404040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 3;stroke-dashoffset:0" />
> -    <text
> -       inkscape:transform-center-x="2.6044813"
> -       transform="scale(0.9999979,1.0000021)"
> -       id="text5217-8-9-2"
> -       y="225.24431"
> -       x="121.1868"
> -       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#404040;fill-opacity:1;stroke:none"
> -       xml:space="preserve"><tspan
> -         id="tspan6156-7-4"
> -         sodipodi:role="line"
> -         x="121.1868"
> -         y="225.24431"
> -         style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14</tspan></text>
> -  </g>
> -  <text
> -     xml:space="preserve"
> -     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
> -     x="108.67482"
> -     y="206.41029"
> -     id="text4119"><tspan
> -       sodipodi:role="line"
> -       id="tspan4121"
> -       x="108.67482"
> -       y="206.41029"
> -       style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">T</tspan></text>
> -  <path
> -     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker3230)"
> -     d="m 79.976346,193.5 12.52908,12.94673"
> -     id="path5636"
> -     inkscape:connector-type="polyline"
> -     inkscape:connector-curvature="0"
> -     inkscape:connection-start="#g5560"
> -     inkscape:connection-start-point="d4"
> -     inkscape:connection-end="#g5631"
> -     inkscape:connection-end-point="d4" />
> -  <text
> -     xml:space="preserve"
> -     style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
> -     x="143.52129"
> -     y="224.8358"
> -     id="text4787"><tspan
> -       sodipodi:role="line"
> -       x="143.52129"
> -       y="224.8358"
> -       id="tspan4791"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">temporary</tspan><tspan
> -       sodipodi:role="line"
> -       x="143.52129"
> -       y="234.8358"
> -       id="tspan4795"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">amend</tspan><tspan
> -       sodipodi:role="line"
> -       x="143.52129"
> -       y="244.8358"
> -       id="tspan4797"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">commit;</tspan><tspan
> -       sodipodi:role="line"
> -       x="143.52129"
> -       y="254.8358"
> -       id="tspan6283"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">obsolete and</tspan><tspan
> -       sodipodi:role="line"
> -       x="143.52129"
> -       y="264.83582"
> -       id="tspan6285"
> -       style="font-size:10px;line-height:1;font-family:sans-serif">hidden</tspan></text>
>     <text
>        xml:space="preserve"
>        style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
> @@ -850,9 +774,4 @@
>        d="m 92.984542,288.7868 c -17.463809,1.31107 -20.109707,1.30681 -21.213204,-14.14214"
>        id="path7860"
>        inkscape:connector-curvature="0" />
> -  <path
> -     style="color:#000000;fill:none;stroke:#707070;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;marker-end:url(#marker3230)"
> -     d="m 139.5,223.5 c -16.33548,3.61997 -8.82833,-10 -24.5,-10"
> -     id="path8482"
> -     inkscape:connector-curvature="0" />
>   </svg>
> diff --git a/docs/figures/figure-ug07.svg b/docs/figures/figure-ug07.svg
> --- a/docs/figures/figure-ug07.svg
> +++ b/docs/figures/figure-ug07.svg
> @@ -199,10 +199,10 @@
>        inkscape:current-layer="layer1"
>        inkscape:document-units="px"
>        showgrid="false"
> -     inkscape:window-width="887"
> -     inkscape:window-height="875"
> -     inkscape:window-x="342"
> -     inkscape:window-y="160"
> +     inkscape:window-width="1814"
> +     inkscape:window-height="950"
> +     inkscape:window-x="51"
> +     inkscape:window-y="82"
>        inkscape:window-maximized="0"
>        fit-margin-top="0"
>        fit-margin-left="0"
> @@ -301,7 +301,7 @@
>            id="tspan3914"
>            x="63.342571"
>            y="150.18422"
> -         style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">15</tspan></text>
> +         style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14</tspan></text>
>       <path
>          style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-6)"
>          d="M 18.241201,77.474272 64.240665,136.78973"
> @@ -414,51 +414,6 @@
>          inkscape:connector-curvature="0"
>          inkscape:connection-end="#rect2987-4-4"
>          inkscape:connection-end-point="d4" />
> -    <g
> -       id="g5631"
> -       transform="translate(-27.905602,-122.06022)">
> -      <rect
> -         y="211.84996"
> -         x="118.4056"
> -         height="18.05327"
> -         width="21.481739"
> -         id="rect2987-4-0-0"
> -         style="fill:none;stroke:#404040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 3;stroke-dashoffset:0" />
> -      <text
> -         inkscape:transform-center-x="2.6044813"
> -         transform="scale(0.9999979,1.0000021)"
> -         id="text5217-8-9-2"
> -         y="225.24431"
> -         x="121.1868"
> -         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#404040;fill-opacity:1;stroke:none"
> -         xml:space="preserve"><tspan
> -           id="tspan6156-7-4"
> -           sodipodi:role="line"
> -           x="121.1868"
> -           y="225.24431"
> -           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14</tspan></text>
> -    </g>
> -    <text
> -       xml:space="preserve"
> -       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
> -       x="108.67482"
> -       y="89.753288"
> -       id="text4119"><tspan
> -         sodipodi:role="line"
> -         id="tspan4121"
> -         x="108.67482"
> -         y="89.753288"
> -         style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">T</tspan></text>
> -    <path
> -       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker3230)"
> -       d="M 80.157925,77.47427 92.323846,89.78974"
> -       id="path5636"
> -       inkscape:connector-type="polyline"
> -       inkscape:connector-curvature="0"
> -       inkscape:connection-start="#g5560"
> -       inkscape:connection-start-point="d4"
> -       inkscape:connection-end="#g5631"
> -       inkscape:connection-end-point="d4" />
>       <flowRoot
>          xml:space="preserve"
>          id="flowRoot8394"
> @@ -494,7 +449,7 @@
>              x="94.915642"
>              id="tspan3914-6"
>              sodipodi:role="line"
> -           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">16</tspan></text>
> +           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">15</tspan></text>
>       </g>
>       <g
>          id="g8803"
> @@ -517,7 +472,7 @@
>              x="174.91582"
>              id="tspan3914-1"
>              sodipodi:role="line"
> -           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">17</tspan></text>
> +           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">16</tspan></text>
>       </g>
>       <path
>          style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448)"
> diff --git a/docs/user-guide.rst b/docs/user-guide.rst
> --- a/docs/user-guide.rst
> +++ b/docs/user-guide.rst
> @@ -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
>   
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> 

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list