Preconditions: Eclipse, Subclipse, svn-load (or svn_load_dirs is equivalent, but i'm using Ubuntu and svn-load can be installed from default repositories)
Here's my example:
- update vendor version 
svn update /path/to/vendor
 - copy updated version to another folder (we'll need to disconnect it from SVN) 
cp -r /path/to/vendor /path/to/vendor_copy
 - disconnect folder from SVN 
rm -fr `find /path/to/vendor_copy -type d -name .svn`
 - Send changes to SVN with svn-load:
svn-load -t tags/vendor_version_2009-02-01 \
* I prefer tagging each vendor import
http://svn.mydomain.com/projectX \
branches/vendor \
/path/to/vendor_copy - In Eclipse be sure that you've committed all changes and you're working in trunk
 - Merge new tag and previous one:

 - in Team Synchronizing perspective double check all changes (this perspective is really useful for merging)
 - commit!
 
No comments:
Post a Comment