[PATCH 2 of 2] update: allow dirty update to successors

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Apr 12 16:35:12 CDT 2013


On 12 avr. 2013, at 22:30, Augie Fackler wrote:

> On Fri, Apr 12, 2013 at 06:55:22PM +0200, pierre-yves.david at logilab.fr wrote:
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
>> # Date 1365784871 -7200
>> #      Fri Apr 12 18:41:11 2013 +0200
>> # Node ID 0f44f99fb5c1d9b05fa0b703e11aa10d7dc0f926
>> # Parent  5bd7702f8e9613a70b2dcf511aef85fd221eff78
>> update: allow dirty update to successors
>> 
> 
> Behavior sounds reasonable, but I'd like someone else to agree with me
> before I push, since I'm not wholly able to channel mpm on this kind
> of thing.

I can testify that this had been discussed and agreed at the sprint. Levi Bard started working on it then. 

This is the first step toward graceful handling of "pull turn your current working directory parent obsolete."

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list