How to work with branches

[Martin Marques]

Kai Grossjohann escribió:
> Martin Marques wrote:
>> Marcin Kasperski wrote:
>>   
>>>> How difficult would it be to add a command which would *freeze* a 
>>>> branch, not letting it be merged with the main development trunk?
>>>>       
>>> I do not know, but ... you may want to merge 1.7 patches to the
>>> trunk, isn't so? And track such merges.
>>>     
>>
>> I would do that with transplant.
>>
>> What I don't want is this:
>>
>>
>> chset: xxx ---> Trunk ------> Some Changesets -----> Merge
>>             \                                      /
>>              --> Branch 1.7 -> Some 1.7 bug fixes -
>>
>>
>> Or am I getting everything wrong? Even if I merge, can I still keep 
>> adding things to the 1.7 branch, which will not get included in Trunk?
>>   
> 
> In the situation depicted above, you can still commit to the trunk as 
> well as the 1.7 branch.  If you do the latter, then the 1.7 branch will 
> gain a head, which will cause "hg push" to warn.  But other than that, 
> there are no consequences.

Almost what I wanted. The problem here (and this I just found out 
fooling with a test repo) is that after the merge, the tip, which is 
actually the trunk, has the branchname of the 1.7 release. Something not 
very nice.

Besides that, this is what I think we'll do.