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

Kevin Peng kevpeng at google.com
Thu Jul 18 13:03:36 EDT 2019


I see. Thanks!

On Thu, Jul 18, 2019 at 2:51 AM Anton Shestakov <av6 at dwimlabs.net> wrote:
>
> On Wed, 17 Jul 2019 12:06:14 -0700
> Kevin Peng via Mercurial-devel <mercurial-devel at mercurial-scm.org>
> wrote:
>
> > 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
> > --- 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
>
> We already pushed your previous patch after some copy editing, so I
> took the liberty of amending this one to apply it cleanly. It can be
> seen and reviewed (if you have bitbucket account) at:
> https://bitbucket.org/octobus/evolve-devel/commits/d0965c5c5335d14ea0bcb4e0bf336f43ba4fe381
>
> And it looks good to me.


More information about the Mercurial-devel mailing list