On 13.02.2012 12:21, edgar.sol...@web.de wrote: > On 11.02.2012 16:38, Giuseppe Aruta wrote: >> Ede, maybe the 1.5 branch needs to be synchronized with r1730 before new >> commits are made in the trunk. >> Ede, do we need to synchronize 1.5 with the trunk now or can we synchronize >> at any time with any release? > > i am not sure about that. never used branches with svn before. but quite > clearly as soon as we add unstable code to trunk we cannot automagically > merge both trees anymore. > we will have to manually add bugfixes to both branches at all time then. > that's why i am sceptical about svn branches, but let's give it a try. found > an encouraging article here: > http://www.dehora.net/journal/2006/02/subversion_tips_dealing_with_branches.html >
ok, just merged stable_1.5 to the latest bugfix in trunk history, this means i excluded the north arrow as it is a new feature. obviously it is easily possible to merge changesets from one branch to another, assuming they have no conflicting changes. http://svnbook.red-bean.com/en/1.6/svn.ref.svn.c.merge.html i used subclipse though, it essentially just clicktoolizes the described above. but this has still some back drafts: - merging has to be done to a local checkout - the afterwards commit then is like a sum up of all selected changesets for the merge, so we have to be a bit proper to include in the comments what revisions we merged - commit messages should be prefixed with the branch name for easier distinction e.g. stable_1.5: ... because i am skeptical of the effort of merging every bugfix into stable_1.5 i suggest we properly comment every trunk commit and select the bugfix changesets from time to time, should be done by a release maintainer (me for now). i also suggest not to wait to long between bugfix releases. i'd say 10 bugs maximum or one severe bug are a good reason to release. especially as the routines are now fully automated. ..ede ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
