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

[Laurens Holst]

Op 12-03-13 19:02, Pierre-Yves David schreef:
> 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
>

Can you elaborate on how this abort saves your changes? Because it is 
not clear to me.

~Laurens