You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 4 Next »

Vendor Branch Management

The steps described in this page cover the steps required for a manual manipulation of the repository. The svn_load_dirs.pl utility could also be used.

COmanage Registry uses various external packages. (See Version Dependencies for current versions of products in use.) The standard Subversion Vendor Branching Model is followed.

  1. Download the package you are adding or updating to a directory outside of your source tree.
  2. Import the package into subversion. If updating an existing package, current should end up with exactly the contents of the new package (and no stray files). It may be easiest to svn rm current first.
    $ svn import ./libfoo-1.2 'https://svn.internet2.edu/svn/comanage/registry/vendor/libfoo/current' -m 'Importing libfoo 1.2 vendor drop'
  3. Tag the import using the new version number.
    $ svn copy 'https://svn.internet2.edu/svn/comanage/registry/vendor/libfoo/current' 'https://svn.internet2.edu/svn/comanage/registry/vendor/libfoo/1.2' -m 'Tagging libfoo 1.2'
  4. Copy the package to the main branch.
    $ svn copy 'https://svn.internet2.edu/svn/comanage/registry/vendor/libfoo/1.2' 'https://svn.internet2.edu/svn/comanage/registry/trunk/path/to/library' -m 'Bringing libfoo 1.2 into the main branch'
  5. Finally, pull the package into your working copy. This could be done via a simple svn update, or if you need to merge local patches across versions you might need something like svn merge /vendor/libfoo/1.2 /vendor/libfoo/current ./libfoo.
  • No labels