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

Kevin Peng kevpeng at google.com
Fri Jul 12 20:23:26 EDT 2019


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.



On Tue, Jul 2, 2019 at 1:27 AM Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
> On 6/15/19 6:20 AM, kevpeng--- via Mercurial-devel wrote:
> > # HG changeset patch
> > # User kevpeng at 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
> >
> > 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.
>
> Hi, what do you think about this wording ?
>
>      When ``--update`` is set, successful evolve operations update the
>      working copy parents to the newly created changesets.
>
> --
> Pierre-Yves David


More information about the Mercurial-devel mailing list