On 7 March 2010 20:13, Vincent Snijders <[email protected]> wrote: > > Do you want to be the maintainer of the "stable" version?
I wouldn't know how using SVN - we use Git remember. Our method of getting a stable version would also probably not be appropriate for others. On a serious note, below is what we do, and I honestly can't see how this would be done in SVN. We try various revisions of Trunk until we hit a "sweet spot" revision that seems quite workable. This is a trial and error test. Once we found one, we tag that revision and create our stable branch off that tag. As soon as we hit a issue, we do a quick search through the newer trunk revisions to see if there was a fix, if so, we cherry-pick that into our own branch based on the Tag we choose before. If there was no fix, we create a feature branch off Trunk with the fix (and send the patch to Mantis). We that merge that fix branch into our stable branch. We also have various other "feature" branches that we can merge in with our stable branch to give us our added (personal) wishlist features. In my case I always merge in the "tabs on right"[1] and "file filters editor"[2] branches. [1] hack to get editor tabs on right side of editor [2] http://bugs.freepascal.org/view.php?id=15679 o Fix A / o Fix B / / ---A---o---o---o---o Trunk \ \ \ D Feature branch 1 \ \ B---C-------o---E A = tagged the "sweet spot" revision B, C = cherry-picked 'Fix A' and 'Fix B' into new branch created from A D = Some home grown feature branch like [1] or [2] above E = My personal branch which has stable C and merged in feature D branch Then periodically we will revise the Trunk branch and tag a new "sweet spot" revision. We will then rebase our home grown feature branches ('git rebase' means it takes the patches in a feature branch and replays them on a new Trunk revision so they always stay up to date and can merge easily if needed because they are based on a newer trunk revision). We then start the whole process again. -- Regards, - Graeme - _______________________________________________ fpGUI - a cross-platform Free Pascal GUI toolkit http://opensoft.homeip.net/fpgui/ -- _______________________________________________ Lazarus mailing list [email protected] http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
