[PATCH RFC] update: add an option to allow to merge local changes when crossing branches
martin at geisler.net
Fri Feb 22 14:30:06 CST 2013
Kevin Bullock <kbullock+mercurial at ringworld.org> writes:
> 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
> Not really a bug, but it is one more merge than would strictly be
That is true with the work-around I use today, but if it was implemented
internally, then I think it could be done with a single merge as one
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 835 bytes
Desc: not available
More information about the Mercurial-devel