Merging to the release_1_6 branch

[Rainer Müller]

Blair Zajac wrote:
> Rainer Müller wrote:
>> So if a release was near, I would do (with some pseudo-shell commands):
>>    svn cp trunk branches/release_1_7
>>    svn cp branches/release_1_7 tags/release_1_7_0-rc1
>>
>> Bug fixes go to branches/release_1_7. Anything can happen on trunk in 
>> the mean time. If the release candidate was considered bug free,
> 
> Ideally you would fix the bug in trunk and then merge it to the release_1_7 
> branch which would appear in the next tagged release.

Oh yes, that's what I meant here.

> Going from the release branch back to trunk has two way merges and doesn't seem 
> as clean and easier to forget that a fix needs to go back to trunk.

This was done with our postflight script as the postflight script in 
trunk also had changes, which were not suited for backporting. But these 
cases should be very rare and there should never be the need to merge it 
to trunk if you make changes directly to the release branch.

Rainer