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

[Kevin Bullock]

On 12 Mar 2013, at 1:02 PM, Pierre-Yves David wrote:

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

I'd much rather just have a stash _command_ that we can suggest in the abort hints for all those commands.

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 187 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130312/09361470/attachment.pgp>