Actually, now I am not so sure...  It appears that the main issue is
just that SVN cannot merge across different repositories, so there is
a requirement for me to have a local mirror of the Cake repository, in
the same repository as my app.  The tutorials I've seen seem to list
the setup steps as:

1.  Checkout remote vendor library from svn (ie CakePHP)
2.  Export this (basically strip out all subversion files) somewhere
on my local machine
3.  Add this exported CakePHP to my repository (as a clean non-
modified CakePHP revision)
4.  Import this into my application, where I can make any changes
needed.

Which isn't too bad.  But when I want to update to a different
revision of CakePHP.
1.  Update remote vendor library.
2.  Export again.
3.  Manually merge all changes from this vendor library into my
repository.
4.  Merge this into my own application, deal with any conflicts I may
have caused.

This is all fine except for step 3 - as it is time consuming (dealing
with all adds/removes/moves), and apparently pointless.  All this is
achieving is duplicating the change history that is already in the
CakePHP svn.  Perhaps I will look for a tool to automatically sync my
local repository with the CakePHP one - it looks like SVK supports
this, but I'm not comfortable with changing my entire repositories
over to a new technology that I am not familiar with (even if it is
based on SVN).

AD7Six - Now I understand what you meant in your comment - this is
tedious!


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to