# HG changeset patch # User Anton Shestakov # Date 1572104646 -25200 # Node ID d1066fb2c95ad18bfedf226aed747020c86482e7 # Parent 8beb44234b3368cf4a9638cddb9ccfef4faccd53 docs: remove --all from hg evolve, since it's been the default for some time diff -r 8beb44234b33 -r d1066fb2c95a docs/figures/figure-ug07.svg --- 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 + style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve diff -r 8beb44234b33 -r d1066fb2c95a docs/figures/figure-ug09.svg --- 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 + style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve diff -r 8beb44234b33 -r d1066fb2c95a docs/figures/figure-ug10.svg --- 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 + style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve diff -r 8beb44234b33 -r d1066fb2c95a docs/figures/figure-ug12.svg --- 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 + style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve diff -r 8beb44234b33 -r d1066fb2c95a docs/sharing.rst --- 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, diff -r 8beb44234b33 -r d1066fb2c95a docs/user-guide.rst --- 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