Branch-aware hg merge in a branchy repository

[Dirkjan Ochtman]

Christopher Nuzum wrote:
> 1. Export each branch into a separate repository, so that each  
> repository will generally have only heads related to that branch of  
> development. We would still be able to merge across repositories.  I  
> haven't been able to put my finger on instructions for how to do this.

You can use hg clone repo#branch to do this, I think.

> 2. In the case where there is only one other head on the current  
> branch, is there way to get hg merge to automatically know that that's  
> the head it should merge with (rather than getting confused by the  
> other branches in the repository)? It seems unambiguous enough. Should  
> I log this as an enhancement request, or is there a reason this isn't  
> already done, or is there a way to do this that I've overlooked?

I think I fixed just that the day before yesterday. Maybe you can test a 
crew snapshot to see if it works for you?

http://hg.xavamedia.nl/mercurial/crew/rev/1fe6f365df2e

Cheers,

Dirkjan