Hi Andreas, >> What are the currently accepted best practices / tools for maintaining > > "vendor" branches? > > > > I've seen the page at: > > http://svnbook.red-bean.com/en/1.7/svn.advanced.vendorbr.html > > > > I ask about updated guidance since: > > > > 1) I notice some (?) churn for this section in the SVN Book repository: > > >https://code.google.com/p/svnbook/source/browse/trunk/en/book/ch04-branching-and-merging.xml > > > > > 2) There appears to be both "svn_load_dirs" and "svn-merge-vendor.py" > > scripts at: > > http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/ > > > > Yes, pretty much by the book. I am maintaining several vendor branches > without use of client side scripts here. Using a client 1.7 or later > helps due to single .svn directory. >
Yep, we're on 1.7 too. It's my understanding that if you want the process to integrate a new vendor drop to be sane, the update ideally should be expressed as a series of "svn actions" (add/update/etc.) so that history is maintained. The obvious option of just doing a delete/add on the whole folder will mess stuff up. Is that correct? If you don't use the client side tools, how can you maintain in-house changes against a series of vendor drops? Or, in your case, do you not need to maintain in-house changes? Alternately, do the client scripts just not work anyway? Regards, David
