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

Martin Geisler 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
>> idea?
> Not really a bug, but it is one more merge than would strictly be
> necessary.

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
would expect.

Martin Geisler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130222/15854bc7/attachment.pgp>

More information about the Mercurial-devel mailing list