[PATCH evolve-ext] evolve: further clarify that update is performed only when requested
kevpeng at google.com
Wed Jul 17 15:06:14 EDT 2019
Here is an updated patch:
# HG changeset patch
# User kevpeng at google.com
# Date 1560563083 25200
# Fri Jun 14 18:44:43 2019 -0700
# Node ID 8716e0b2ff1cf09efa79dca6303a83600ee42824
# Parent 8195452be71d446eff972ea128199f943731b7fb
evolve: further clarify when update is performed
diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
@@ -1536,9 +1536,9 @@ 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.
+ When ``--update`` is set, a successful evolve operation will update the
+ working copy to the newly created changeset. Moreover, an update will
+ always be performed if the current working directory parent is obsolete.
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
On Wed, Jul 17, 2019 at 9:03 AM Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
> On 7/13/19 2:23 AM, Kevin Peng wrote:
> > LGTM. Anton Shestakov also pointed out that evolve will also
> > automatically update if the working dir parent is obsolete; perhaps we
> > should mention that as well?
> > What about:
> > When ``--update`` is set, a successful evolve operation will update the
> > working copy to the newly created changeset. Moreover, an update will
> > always be performed if the current working directory parent is obsolete.
> > If this looks good to you, then I can send an updated patch.
> This looks good. Anton, what do you think about it?
> Pierre-Yves David
More information about the Mercurial-devel