Merging to QA

This page explains how to merge one's commits to QA after going through peer review.

The first time will take a while to download and cache the full svn log that it needs to work from.
If you get anything you don't understand or any conflicts then let a senior developer know.
Whatever you do don't just carry on if it doesn't look quite right, this can have undesired effects.

1. Create a directory to store svn checkouts:

   sudo mkdir FILEPATH

2. Checkout the web scat repository to that location (cd there, then run below command):

   sudo svn co https://svn.zednax.com/svn/web_scat/trunk web_scat

3. Checkout the required repository to that location, for example zymonic core:

   sudo svn co https://svn.zednax.com/svn/zymonic/branches/qa zymonic-qa

4. Change the directory to the necessary repository:

   cd zymonic-qa

5. Run the following merge command:

   sudo perl ../web_scat/scripts/srmerge.pl SR_NUMBER

Once again, to reiterate:
The first time will take a while to download and cache the full svn log that it needs to work from.
If you get anything you don't understand or any conflicts then let a senior developer know.
Whatever you do don't just carry on if it doesn't look quite right, this can have undesired effects.