On Wed, Aug 29, 2012 at 04:02:40PM -0400, Ryan Lange wrote: > Now, instead of importing the vendor's 1.0.1 package into current, I > would import it into 1.0.1. This seems like a much cleaner solution > to me, but I'm always afraid that there's something I'm missing. Can > anyone see anything wrong with this solution? Is there a better way?
You can use 'svn import' to import vendor releases, rather than using svn_load_dirs.pl. Put the releases into /vendor/1.0.1, /vendor/1.2.0, etc. As of Subversion 1.6 this won't store any redundant content in the repository because of the representation-sharing feature (http://subversion.apache.org/docs/release-notes/1.6.html#rep-sharing). And then merge differences between arbitrary vendor releases into your own code like this: svn checkout http://svn.example.com/trunk cd trunk svn merge ^/vendor/1.0.1 ^/vendor/1.0.2 . See also this recent discussion about the same issue: http://mail-archives.apache.org/mod_mbox/subversion-users/201208.mbox/%3C2E34DA2E-B7B8-4356-AA4E-579861635498%40ryandesign.com%3E
