The old process was a normal svn vendor branch , however I only ever copied a subdirectory to the main code base. So for:
vendors/Zend_Framework/current/library/Zend
was copied to:
trunk/library/Zend
Then I will add a new version, mark it and merge the differences between the two library / Zend folders in trunk / library / Zend
How to do it in Git?
My first thoughts on how to create a git clone of a subversion repository using git-svn and then use subtree merging, but I'm not sure how this can be achieved when the target is actually an external repo subdirectory. Honestly, I would prefer not to merge in all other directories, such as documentation and tests.
git, , , git, , dirs, dirs/ ?