Creating a RC (Release Candidate)
From command line:
1. http://halsvn01/websvn/ copy the link for SVN for the branch being tagged, remove trailing slash from source of copy on next step
2. svn copy http://halsvn01/svn/hal/branches/RC/12.11-RC http://halsvn01/svn/hal/tags/12.11-RC1 -m "Tagging current RC branch to 12.11-RC1"
Creating a Release Candidate from Eclipse:
1. Open SVN Repository Explorer in Eclipse
2. Expand to current RC branch (ex. 12.11-RC), and right-click
3. Choose branch/tags option
4. Choose "Copy to URL", "Select" and choose "tags" directory
5. http://halsvn01/svn/hal/tags/12.11-RC1 (YY.WK-RC1)
6. Next, Next
7. Use a comment, example: "Tagging current RC branch to 12.11-RC1"
8. Finish
Update Hudson Job
1. Login to Hudson
2. hal-tst
3. Configure
4. Refresh Page
5. Change Project description to reflect release candidate
6. Change Repository URL
7. Click save and answer prompts, if necessary
8. Go to Dashboard and hit refresh
9. Hit refresh
How to revert code to an earlier version
-----Original Message-----
From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Friday, March 16, 2012 12:36 PM
To: Ruckman, Maurice (HAL)
Cc: Doan, Thomas (HAL Contractor); Fillman, Eric (HAL); Augustine, Anila (HAL); Thompson, Sonya (HAL); Phatak, Sheetal (HAL); Bojja, Sridhar (HAL Contractor); jlindesm@redhat.com; HAL DistList: IS UNIX; Tripp, Donald (HAL)
Subject: Re: Yum update haldevjbs06
Not sure. Try this from the /home/jboss1/programs/jboss-eap-5.1/jbossas/server/haldev-vmtemplate folder:
$ svn log
--->Look at the revision number you want to rollback to
$ svn update -r MyRevNumbder
Guillaume
Creating a new branch
To create a new branch, in Eclipse in the svn repository explorer, right click on the folder 12.11-RC and select create branch. The new location should be something like http://halsvn01/svn/hal/branches/features/fix-security-settings
Or from the command line:
$ svn copy http://halsvn01/svn/hal/branches/RC/12.11-RC http://halsvn01/svn/hal/branches/features/simplified-welcome-page -m "Creating feature branch simplified-welcome-page"
Resolving conflict when merging
Today, we had a conflict when merging the jboss stabilization branch into the RC. Here are the steps I used to resolve it. The basic process was to first merge the RC into the jboss-stabilization branch, resolve the conflict and then merge the jboss-stabilization branch back into the RC:
552 svn co http://halsvn01/svn/hal/branches/features/jboss-stabilization
553 svn status
554 cd jboss-stabilization/
555 svn status
556 svn info
557 svn merge http://halsvn01/svn/hal/branches/RC/12.11-RC
558 svn status
559 svn resolve --accept=working halwebsite/com
560 svn status
561 svn commit -m "Sync jboss-stabilization branch with 12.11-RC"
562 ls
563 cd ..
564 rm -rf jboss-stabilization/
565 svn co http://halsvn01/svn/hal/branches/RC/12.11-RC
566 cd 12.11-RC/
567 svn merge --reintegrate http://halsvn01/svn/hal/branches/features/jboss-stabilization
568 svn status
-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com
-------------------------------------
SVN Property Get
Obtain the merge info of the parent folder:
svn propget svn:mergeinfo .
Checkout files in svn
mkdir ~/test_workshop
cd ~/test_workshop
svn checkout http://halsvn01/svn/hal-test/trunk hal
Real production files are here:
svn checkout http://halsvn01/svn/hal/branches/features/jboss-migration/ hal
It will now prompt you for the jboss1/holland123 credentials
use your network signon
Reset defaults in SubVersion
Use the following command to remove all of the previous settings for subversion, necessary because the VM was cloned from Eric's machine, and we all inherited his settings. Need subversion to ask for our userid / password when checking out files.
rm -rf ~/.subversion/