Patchwork [evolve-ext] evolve: further clarify that update is performed only when requested

login
register
mail settings
Submitter via Mercurial-devel
Date June 15, 2019, 4:20 a.m.
Message ID <26769b7cb539e08ed518.1560572439@kevpeng>
Download mbox | patch
Permalink /patch/40540/
State New
Headers show

Comments

via Mercurial-devel - June 15, 2019, 4:20 a.m.
# HG changeset patch
# User kevpeng@google.com
# Date 1560563083 25200
#      Fri Jun 14 18:44:43 2019 -0700
# Node ID 26769b7cb539e08ed51823750fe799cef1f10bf5
# Parent  8195452be71d446eff972ea128199f943731b7fb
evolve: further clarify that update is performed only when requested
Anton Shestakov - June 24, 2019, 3:56 p.m.
On Fri, 14 Jun 2019 21:20:39 -0700
kevpeng--- via Mercurial-devel <mercurial-devel@mercurial-scm.org>
wrote:

> # HG changeset patch
> # User kevpeng@google.com
> # Date 1560563083 25200
> #      Fri Jun 14 18:44:43 2019 -0700
> # Node ID 26769b7cb539e08ed51823750fe799cef1f10bf5
> # Parent  8195452be71d446eff972ea128199f943731b7fb
> evolve: further clarify that update is performed only when requested

To be precise, evolve still performs an update when working directory
parent is obsolete (no need for --update); and _warnobsoletewc() in
evolve/__init__.py recommends running plain `hg evolve` in such case.

I'll ping Pierre-Yves about this patch, sorry about the delay.

Patch

diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py
+++ b/hgext3rd/evolve/evolvecmd.py
@@ -1536,9 +1536,8 @@  def evolve(ui, repo, **opts):
     If so, evolve rebases that changeset. If not, evolve refuses to guess your
     intention, and gives a hint about what you might want to do next.
 
-    Any time evolve creates a changeset, it updates the working copy to the new
-    changeset. Using ``--update`` will make evolve perform an update after any
-    successful evolve operation.
+    Using ``--update`` will make evolve update the working copy to the new
+    changeset after any successful evolve operation.
 
     Automatic mode only handles common use cases. For example, it avoids taking
     action in the case of ambiguity, and it ignores orphan changesets that are