Have you guys tried using SVK on the maven tree in the ASF SVN? This
is a really kick ass tool for managing branches and merging repos.
Its like Perforce for SVN... er, well kinda.
I really wanted to use this for Geronimo, but the huge singleton ASF
SVN repo is not really helping out, actually its causing problems.
SVK works by making a local SVN repository and then sync'ing the
entire revisions for whatever paths you're working on. This is so
that it can easily look up revisions fo merge points and handle
merging automatically for the most part. The huge SVN repo makes
that process slow and often times will kill an SVK sync due to eh,
bug in SVN, bug in SVK, bug blah...
The tool is still getting better and better... but the huge singleton
ASF SVN repo for everything-under-the-sun (sans uber-secret-private-
muck) isn't really helping things at all.
IMO, each TLP at the ASF should have its own SVN repo... um, say
kinda like they have over at the Codehaus ;-)
* * *
But anyways, I really think that using branches is a very good
idea... its just that with SVN as it is... sometimes merging changes
back form your branches can be more trouble than its worth and can in
some cases be problematic.
If you guys can get SVK working for you... then I'd highly recommend
using it to create small feature branches for isolated work, then
once the feature is ready simply merge it back in. If you keep your
feature branch updated frequently with changes to the limb you
branched from (which is very easy) then when its time to merge your
work back then you can most often do it with your eyes closed.
--jason
On Sep 7, 2007, at 3:52 PM, John Casey wrote:
I thought we'd agreed awhile back to do this, but apparently that's
not the case.
When I updated from Subversion today, I got a nasty surprise. Lo
and behold, it would not bootstrap! I didn't find much discussion
on the dev list about a massive reorganization (none, in fact), and
the number of commits makes it pretty difficult to parse out
exactly where things went wrong. Suffice it to say that I'm doing
all of my build/plugin work today based on 2.1-SNAPSHOT artifacts,
not on a trunk build.
Can we please, please, PLEASE start using feature friggin
branches?? It's not so difficult to merge them in when you're done,
and I'm willing to help anyone who has trouble.
-john
---
John Casey
Committer and PMC Member, Apache Maven
mail: jdcasey at commonjava dot org
blog: http://www.ejlife.net/blogs/john
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
