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

Pierre-Yves David pierre-yves.david at logilab.fr
Tue Mar 12 13:02:04 CDT 2013


On Fri, Feb 22, 2013 at 11:22:07AM +0100, Gilles Moris wrote:
> # HG changeset patch
> # User Gilles Moris <gilles.moris at free.fr>
> # Date 1361528509 -3600
> # Node ID 567106adefd309717d8f0538197dc7dde45d34f1
> # Parent  013fcd112f13f31a35ea6a40d8cd1c6923cdaf20
> update: add an option to allow to merge local changes when crossing branches

Let's sum up my opinion on that:

1) We cannot have this behavior by default. preventing such update by default
   frequently save my changes.

   The same as mercurial prevent multiple operation in the middle of merge or a
   rebase.

   We need more of such safety

2) Not being able to do this update at all is painful. Intermediate update to
   common ancestor have more chances to conflict. And explaining this gymnastic
   to new comers is nuts.

3) a --merge option for update make more sense that a --stash one.
   BUT we are going to want a --stash option in a couple of other places:
   - merge
   - rebase
   - histedit
   - probably others

   So we better have a single option for all. The --merge option does not make
   sense for other command. We should use --stash one for update too.

-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130312/eda8fb3c/attachment.pgp>


More information about the Mercurial-devel mailing list