On Thu, Oct 14, 2010 at 09:55:08PM +0200, Olivier Sannier wrote: > On 14/10/2010 21:45, Dan Nessett wrote: > >On Thu, 14 Oct 2010 15:38:41 -0400, Bob Archer wrote: > >>>Generally, (using subversion) we > >>>check out a tagged version into a workspace, recursively delete the > >>>.svn directories, modify a small number of files, add some of our own > >>>extensions, and then commit the result into our own repository. We then > >>>work with the source from there.
> >>There is a whole section in the svn book about this... > >> > >>http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.advanced.vendorbr > >I have read this section. It is about vendor drops, but it doesn't answer > >the question I asked. Basically, we are doing a vendor drop now. It doesn't sound like you're using the approach described in the book. With vendor branching, you work with 2 distinct branches, one containing pristine upstream vendor code, and one containing the modified version. Rather than adding the upstream source code mixed up with your own modifications directly. You might also want to take a look at Piston: http://piston.rubyforge.org/ Stefan
