Hey Martin, vendor branching means that you *do not* use svn:externals but update the vendor branch manually from time to time yourself.
This page has all information about this process: http://svnbook.red-bean.com/en/1.1/ch07s05.html Let me know if that helps, -- Felix Geisendörfer aka the_undefined -------------------------- http://www.thinkingphp.org http://www.fg-webdesign.de Martin Schapendonk wrote: > Felix and the rest, > > I have tried your suggestion to create a vendor branch. I have a > directory with cake setup as svn:externals, however, if I try to copy > and commit it, I get the following error: > > [EMAIL PROTECTED]:~/findem/vendor/cakephp$ svn update > > Fetching external item into '1.2.x.x' > External at revision 4273. > > At revision 26. > > [EMAIL PROTECTED]:~/findem/vendor/cakephp$ svn copy 1.2.x.x/ 1.2.x.x.4273/ > A 1.2.x.x.4273 > > [EMAIL PROTECTED]:~/findem/vendor/cakephp$ svn commit > Adding cakephp/1.2.x.x.4273 > svn: Commit failed (details follow): > svn: PROPFIND request failed on '/repo/trunk/cake/1.2.x.x' > svn: PROPFIND of '/repo/trunk/cake/1.2.x.x': 405 Method Not Allowed > (https://dev.schapendonk.org) > svn: Your commit message was left in a temporary file: > svn: '/home/martin/findem/vendor/svn-commit.tmp' > [EMAIL PROTECTED]:~/findem/vendor/cakephp$ > > The path /repo/trunk/cake/1.2.x.x refers to CakePHP's svn repository! > It seems that svn copy "remembers" where it got the files from. > > What is the proper way to tag a directory that is a svn:externals? > > 2006/12/4, Felix Geisendörfer <[EMAIL PROTECTED]>: > >> Hey Felix, really good suggestion... I'm going to try implementing this. >> However, I would I manage changes to files inside app/webroot (as you said) >> considering they're out of the vendor "package"? >> Nothing is out of the vendor package ; ). A complete copy of the latest >> version of CakePHP always rests in /vendors/cakephp/current. When a new >> CakePHP version is released, you checkout /vendors/cakephp/current and >> simply copy the new version over the old one. If files were removed you have >> to delete them manually (via SVN), but that doesn't happen very often. Then >> you commit the new version. After that you tag it in /vendors/cakephp (in >> our case as r4064). After that you simply merge the changes between the last >> CakePHP version (r3825) and the current one (r4064) into /trunk (your >> working copy of it). In case things inside /app have changed, *only* those >> changes will be applied, no custom mods will be overwritten. After merging >> the update in, you commit /trunk and voila, you updated CakePHP. >> >> For a better understanding checkout a typical vendor branch folder layout: >> >> vendors >> |---cakephp >> |---|---r4064 >> |---|---|---app >> |---|---|---docs >> |---|---|---cake >> |---|---|---vendors >> |---|---|---index.php >> |---|---|---.htaccess >> |---|---current >> |---|---|---app >> |---|---|---docs >> |---|---|---cake >> |---|---|---vendors >> |---|---|---index.php >> |---|---|---.htaccess >> |---|---r3825 >> |---|---|---app >> |---|---|---cake >> |---|---|---vendors >> |---|---|---index.php >> |---|---|---.htaccess >> |---|---|---VERSION.txt >> >> I hope that helps. >> >> -- Felix >> >> -------------------------- >> http://www.thinkingphp.org >> http://www.fg-webdesign.de >> >> Marcelo de Moraes Serpa wrote: >> >> >>> Well, most of the times replacing the /cake folder will be enough. >>> >> Sometimes however, files inside /app change, like /app/webroot/index.php. In >> those cases you should replace them as well to be on the safe side. >> >>> In order to see what has changed in those files you can check the SVN >>> >> difference between your local version and the one you intent to upgrade to. >> The best way to get this hassle out of your life is to manage your project >> in SVN and to use a vendor branch for CakePHP. This makes updating very easy >> and I highly recommend it. >> >> >> >> Hey Felix, really good suggestion... I'm going to try implementing this. >> However, I would I manage changes to files inside app/webroot (as you said) >> considering they're out of the vendor "package"? >> >> >> >> On 12/4/06, Claudio Poli <[EMAIL PROTECTED]> wrote: >> >>> I'm having some problem.. >>> In an application I've loaded a bunch of model into app_controller.php >>> like >>> var $uses = array('Blah', 'Etc'); >>> to be available in every controller; after the upgrade into every >>> controller I go CakePHP tells me that he wants a model with the same >>> name as the controller. >>> for example I've a Welcome controller that do not have any model but >>> uses an Article model. >>> >>> what's going wrong here? >>> >>> thanks >>> >>> >>> >>> >> >> >> > >> >> > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Cake PHP" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/cake-php?hl=en -~----------~----~----~----~------~----~------~--~---
