You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by Apache Bloodhound <bl...@incubator.apache.org> on 2013/03/27 18:21:00 UTC

[Apache Bloodhound] BloodhoundVendorBranchUpgrade modified

Page "BloodhoundVendorBranchUpgrade" was changed by gjm
Diff URL: <https://issues.apache.org/bloodhound/wiki/BloodhoundVendorBranchUpgrade?action=diff&version=4>
Revision 4
Comment: updating repository locations post graduation
Changes:
-------8<------8<------8<------8<------8<------8<------8<------8<--------
Index: BloodhoundVendorBranchUpgrade
=========================================================================
--- BloodhoundVendorBranchUpgrade (version: 3)
+++ BloodhoundVendorBranchUpgrade (version: 4)
@@ -9,8 +9,8 @@
  1. Check out a copy of the vendor branch:
 {{{
 #!sh
-svn co https://svn.apache.org/repos/asf/incubator/bloodhound/trunk bloodhound
-svn co https://svn.apache.org/repos/asf/incubator/bloodhound/vendor/trac
+svn co https://svn.apache.org/repos/asf/bloodhound/trunk bloodhound
+svn co https://svn.apache.org/repos/asf/bloodhound/vendor/trac
 cd trac
 }}}
  1. Locally remove the current directory and replace with the new version:
@@ -27,7 +27,7 @@
 {{{
 #!sh
 svn commit -m "importing trac-1.0.1"
-svn copy https://svn.apache.org/repos/asf/incubator/bloodhound/vendor/trac/current https://svn.apache.org/repos/asf/incubator/bloodhound/vendor/trac/1.0.1 -m "tagging trac 1.0.1"
+svn copy https://svn.apache.org/repos/asf/bloodhound/vendor/trac/current https://svn.apache.org/repos/asf/bloodhound/vendor/trac/1.0.1 -m "tagging trac 1.0.1"
 svn up
 }}}
  1. Merge the changes into the trunk copy:
@@ -36,7 +36,7 @@
 cd ../bloodhound
 # first merge argument is the remote repo path to the previous tagged version
 # second merge argument is the remote repo path to the newly updated current branch
-svn merge ^/incubator/bloodhound/vendor/trac/1.0 ^/incubator/bloodhound/vendor/trac/current trac
+svn merge ^/bloodhound/vendor/trac/1.0 ^/bloodhound/vendor/trac/current trac
 }}}
   the above may throw up conflicts due to changes that we have made in bloodhound trunk.
  1. test test test - note that even when there are no merge conflicts, there may still be errors introduced.
@@ -52,9 +52,9 @@
 
 {{{
 #!sh
-svn import /path/to/vendorcode-x.y.z https://svn.apache.org/repos/asf/incubator/bloodhound/vendor/vendorcode/current -m "importing initial x.y.z vendor drop of vendorcode"
-svn copy https://svn.apache.org/repos/asf/incubator/bloodhound/vendor/vendorcode/current https://svn.apache.org/repos/asf/incubator/bloodhound/vendor/vendorcode/x.y.z -m "tagging vendorcode-x.y.z"
-svn copy https://svn.apache.org/repos/asf/incubator/bloodhound/vendor/vendorcode/x.y.z https://svn.apache.org/repos/asf/incubator/bloodhound/trunk/vendorcode -m "bringing vendorcode-x.y.z into trunk"
+svn import /path/to/vendorcode-x.y.z https://svn.apache.org/repos/asf/bloodhound/vendor/vendorcode/current -m "importing initial x.y.z vendor drop of vendorcode"
+svn copy https://svn.apache.org/repos/asf/bloodhound/vendor/vendorcode/current https://svn.apache.org/repos/asf/bloodhound/vendor/vendorcode/x.y.z -m "tagging vendorcode-x.y.z"
+svn copy https://svn.apache.org/repos/asf/bloodhound/vendor/vendorcode/x.y.z https://svn.apache.org/repos/asf/bloodhound/trunk/vendorcode -m "bringing vendorcode-x.y.z into trunk"
 }}}
 
 Development can then continue in the {{{trunk/vendorcode}}} area and upgrading {{{vendorcode}}} to a new version follows a similar path to that described above.
-------8<------8<------8<------8<------8<------8<------8<------8<--------

--
Page URL: <https://issues.apache.org/bloodhound/wiki/BloodhoundVendorBranchUpgrade>
Apache Bloodhound <https://issues.apache.org/bloodhound/>
The Apache Bloodhound (incubating) issue tracker

This is an automated message. Someone added your email address to be
notified of changes on 'BloodhoundVendorBranchUpgrade' page.
If it was not you, please report to .