Re: [TCLCORE] Merging 8.4 bug fixes

[Twylite <tw...@cr...>]

On 2011/03/09 11:56 PM, Jan Nijtmans wrote:
> 2011/3/9 miguel sofer<mig...@gm...>:
>> I guess it is just "reverse the path:
>>
>>    commit to trunk
>>    merge trunk to core-8-5-branch
>>    merge core-8-5-branch to core-8-4-branch
>>
>> This should keep the things properly in sync, AFAIU. The issue is to
>> allow fossil to maintain a proper 'last merged' for trunk-8.5 and 8.5-8.4
>>
>> Right?
> No, not right. EVERY bug-fix on core-8-4-branch must be in higher
> branches, but the reverse is not true. For this case, there is a special
> --cherrypick option to the merge command.
Indeed, you must cherrypick, or all branches will become 8.6 ;)  People 
working with this may want to turn off autosync ("fossil settings 
autosync off") and familiarize themselves with the "undo" command until 
they are comfortable with the process.

Regards,
Twylite