Merging with ancestor and DAG well-formedness

Mads Kiilerich mads at kiilerich.com
Thu Dec 30 12:08:25 CST 2010


On 12/30/2010 06:39 PM, Dan Villiom Podlaski Christiansen wrote:
> On 30 Dec 2010, at 18:04, Mads Kiilerich wrote:
>> After 9e7e24052745 "properly" is defined as a fast forward merge,
>> giving a changeset with one parent which is on another branch.
>
> Won't this leave a dangling head on the branch?

No, as far as I can see and test there are no bugs that makes Mercurial 
consider changesets branch heads when they have descendants on the same 
branch.

/Mads


More information about the Mercurial-devel mailing list