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

Martin Geisler martin at geisler.net
Fri Feb 22 09:03:55 CST 2013


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?

-- 
Martin Geisler


More information about the Mercurial-devel mailing list