[PATCH RFC] update: add an option to allow to merge local changes when crossing branches

[Kevin Bullock]

On 22 Feb 2013, at 9:03 AM, Martin Geisler wrote:

> Laurens Holst <laurens.nospam at grauw.nl> writes:
> 
>> Anyway, my point is, why can’t it do it this by default.
> 
> I always do
> 
>  $ hg update 'ancestor(., $TARGET)'
>  $ hg update $TARGET
> 
> when I get the warning about crossing branches and so far it has worked
> fine -- but maybe there is a subtle bug somewhere that makes that a bad
> idea?

Not really a bug, but it is one more merge than would strictly be necessary.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock