You can use svn branches as well using git-svn in much the same way, no need to use github. You just make a new local branch based off a remote svn branch (or use git-svn to make the svn branch I believe) and then the workflow is really just the same as when working with trunk but dcommiting to the branch instead.
The only thing you might have to watch out for is doing straight git merges between the 'svn branches' directly as the log messages will probably end up with unintended git-svn-id in them. That's easily fixed with an interactive rebase and a quick edit of the commit logs though, and as the 'proper' way of working with git would probably be to make local branch off the svn backed 'master' branches anyway that shouldn't actually be a problem in the first place. Robbie > -----Original Message----- > From: Andrew Stitcher [mailto:astitc...@redhat.com] > Sent: 19 January 2011 19:07 > To: dev@qpid.apache.org > Subject: Re: RFC: svn branching for new feature development > > On Wed, 2011-01-19 at 13:27 -0500, Ken Giusti wrote: > > ... > > Would it make sense, in general, to allow developers to create > branches for the development of new or possibly disruptive features? > We could leave it up to the release manager to make the go/no-go call > for merging the branch prior to the alpha release. > > > As far as I know this is already the way that we are "supposed" to be > developing substantial features. > > However, at least for me, a reason not to do this and to use github is > precisely that svn makes the eventual merge more painful than > necessary. > Whereas git makes it between trivial and very easy (in my experience) > and allows you to keep the full development history on check in too (I > "git rebase" my branch on trunk then "git svn dcommit" all of it) > > Personally I'd vote for doing the work on github and posting the > repo/branch url to the dev list to allow people to follow what's going > on. > > Andrew > > > > --------------------------------------------------------------------- > Apache Qpid - AMQP Messaging Implementation > Project: http://qpid.apache.org > Use/Interact: mailto:dev-subscr...@qpid.apache.org --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:dev-subscr...@qpid.apache.org
