[PATCH RFC] update: default update should move as far forward as possible (issue3883)

[Tim Delaney]

On 16 April 2013 03:33, Durham Goode <durham at fb.com> wrote:

> On 4/12/13 3:15 PM, "Matt Mackall" <mpm at selenic.com> wrote:
>
> >Is this table correct and complete? The first line, 'same' column seems
> >to say "hg update with no args and clean working directory that wants to
> >go to a head that's on the same branch but isn't a linear descendant..
> >gets error message (1)". Do we not get that hint?
>
> With my proposal (1) would become a warning instead of an abort. Something
> like:
> "newer commits exist on another branch (use 'hg update -c' to go there)".
> The rest of the chart should be unchanged since my change only affects the
> case where 'rev == n'


I would prefer to only get this warning when updating to a head. If I'm
deliberately updating to a non-head changeset, then presumably I know what
I'm doing and shouldn't be told about divergent changesets.

But it's not actually a problem in a rebase workflow so I'm hesitant to
> flag it as 'warning'.


Yeah - I think it's more of a hint than a warning in either case.

Tim Delaney
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130416/549996de/attachment.html>