On May 2, 11:04 am, Christian Boos <[EMAIL PROTECTED]> wrote:
> Well, from the lesson learnt during 0.10-stable maintenance, I can say
> that using svnmerge for tracking to merges from trunk to stable quickly
> becomes unusable, as there's too much manual maintenance to do for the
> "blocked" changes and the situation, while manageable at the beginning,
> only worsen over time, as more and more changes need to be blocked.
>
> However, it could eventually work if the merges are done in the other
> direction (from stable to trunk), as bug fixes should usually also apply
> to trunk. For example, this is what the Mercurial project does, they
> have an hg-stable branch where they do the bug fixes, and that branch
> regularly gets merged into the default branch (the development branch
> for the next version). This minimizes the merge tracking maintenance.
>
I like that idea. It would make for fewer changes to sync, and as the
differences between branch and trunk increases over time it becomes
more likely that a merge could break something unexpected. Better it
breaks in trunk than in the stable branch.
That then means we need to make the 'backport' decision at commit
time, and commit to branch or trunk as appropriate. A periodic sync
should then be OK.
Which again raises a new question of all the changes scheduled for
0.11.x, and the development policy that has so often been discussed:
Only major bug and security features for stable brances, and new
development happens in trunk for next major version. Based on this
policy only be a few handfuls of the current 177 open tickets for 0.11-
stable should actually go in the branch, the rest should be targeted
for 0.12 in trunk.
An 0.12 release that should not be in the far too distant future,
btw... :-)
:::simon
https://www.coderesort.com
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac
Development" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/trac-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
