Mercurial > evolve

changeset 4920:d1066fb2c95a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs: remove --all from hg evolve, since it's been the default for some time
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 26 Oct 2019 22:44:06 +0700
parents 8beb44234b33
children a7c01a2a3974 dacbd20b2f72
files docs/figures/figure-ug07.svg docs/figures/figure-ug09.svg docs/figures/figure-ug10.svg docs/figures/figure-ug12.svg docs/sharing.rst docs/user-guide.rst
diffstat 6 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/docs/figures/figure-ug07.svg	Sat Oct 26 22:43:06 2019 +0700
+++ b/docs/figures/figure-ug07.svg	Sat Oct 26 22:44:06 2019 +0700
@@ -236,7 +236,7 @@
          id="tspan8594"
          x="113.19138"
          y="21.624107"
-         style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+         style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
     <g
        id="g6372"
        transform="translate(63.844068,-32.28608)">
--- a/docs/figures/figure-ug09.svg	Sat Oct 26 22:43:06 2019 +0700
+++ b/docs/figures/figure-ug09.svg	Sat Oct 26 22:44:06 2019 +0700
@@ -110,7 +110,7 @@
          id="tspan8594"
          x="132.17838"
          y="-88.939552"
-         style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+         style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
     <g
        id="g6372"
        transform="translate(82.830913,-142.84994)">
--- a/docs/figures/figure-ug10.svg	Sat Oct 26 22:43:06 2019 +0700
+++ b/docs/figures/figure-ug10.svg	Sat Oct 26 22:44:06 2019 +0700
@@ -570,7 +570,7 @@
          sodipodi:role="line"
          x="79.694885"
          y="806.03015"
-         style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+         style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
     <g
        id="g6372-4-2"
        transform="translate(32.179684,745.12164)">
--- a/docs/figures/figure-ug12.svg	Sat Oct 26 22:43:06 2019 +0700
+++ b/docs/figures/figure-ug12.svg	Sat Oct 26 22:44:06 2019 +0700
@@ -333,7 +333,7 @@
            x="76.696045"
            sodipodi:role="line"
            id="tspan3322"
-           style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+           style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
       <g
          transform="translate(29.180861,844.4619)"
          id="g6372-4-2">
--- a/docs/sharing.rst	Sat Oct 26 22:43:06 2019 +0700
+++ b/docs/sharing.rst	Sat Oct 26 22:44:06 2019 +0700
@@ -693,7 +693,7 @@
 As usual when there's trouble in your repository, the solution is to
 evolve it::
 
-  $ hg evolve --all
+  $ hg evolve
 
 Figure 8 illustrates Bob's repository after evolving away the phase-divergent
 changeset. Ignoring the obsolete changesets, Bob now has a nice,
--- a/docs/user-guide.rst	Sat Oct 26 22:43:06 2019 +0700
+++ b/docs/user-guide.rst	Sat Oct 26 22:44:06 2019 +0700
@@ -403,7 +403,7 @@
 
 The fix is to *evolve* history::
 
-  $ hg evolve --all
+  $ hg evolve
 
 This is a separate step, not automatically part of ``hg amend``,
 because there might be conflicts. If your amended changeset modifies a
@@ -418,7 +418,7 @@
 
 .. figure:: figures/figure-ug07.svg
 
-   Figure 7: evolve your repository (``hg evolve --all``) to take care
+   Figure 7: evolve your repository (``hg evolve``) to take care
    of instability. Orphan changesets become obsolete, and are
    replaced by successors just like the amended changeset was.
 
@@ -450,14 +450,14 @@
 As before, the solution to orphan changesets is to evolve your
 repository::
 
-  $ hg evolve --all
+  $ hg evolve
 
 This rebases revision 20 on top of 18 as the new revision 21, leaving
 19 and 20 obsolete and hidden:
 
 .. figure:: figures/figure-ug09.svg
 
-   Figure 9: once again, ``hg evolve --all`` takes care of instability.
+   Figure 9: once again, ``hg evolve`` takes care of instability.
 
 Example 9: Uncommit files from an older changeset (discard changes)
 =======================================================================
@@ -491,7 +491,7 @@
 hack, so we can discard it and immediately evolve the instability away::
 
   $ hg revert file2.c
-  $ hg evolve --all
+  $ hg evolve
   move:[23] fix bug 67
   atop:[24] fix bug 53
 
@@ -545,7 +545,7 @@
 This is where things get tricky. As usual when a repository has
 orphan changesets, we want to evolve it::
 
-  $ hg evolve --all
+  $ hg evolve
 
 The problem is that ``hg evolve`` rebases revision 27 onto revision
 28, creating 30 (the successor of 27). This is entirely logical: 27