Merging to QA: Difference between revisions
Content added Content deleted
m (Added sudo) |
m (clarification) |
||
| (2 intermediate revisions by one other user not shown) | |||
| Line 7: | Line 7: | ||
<ol><li> |
<ol><li> |
||
Create a directory to store svn checkouts: |
Create a directory to store svn checkouts: |
||
<pre> |
<pre>mkdir FILEPATH</pre> |
||
</li><li> |
</li><li> |
||
Checkout the web scat repository to that location (cd there, then run below command): |
Checkout the web scat repository to that location (cd there, then run below command): |
||
<pre> |
<pre>svn co https://svn.zednax.com/svn/web_scat/trunk web_scat</pre> |
||
</li><li> |
</li><li> |
||
Checkout the required repository to that location, for example zymonic core: |
Checkout the required repository to that location, for example zymonic core: |
||
<pre> |
<pre>svn co https://svn.zednax.com/svn/zymonic/branches/qa zymonic-qa</pre> |
||
</li><li> |
</li><li> |
||
Change the directory to the necessary repository: |
Change the directory to the necessary repository: |
||
<pre>cd zymonic-qa</pre> |
<pre>cd zymonic-qa</pre> |
||
</li><li> |
</li><li> |
||
Run the following merge command: |
Run the following merge command WITHOUT sudo: |
||
<pre> |
<pre>perl ../web_scat/scripts/srmerge.pl SR_NUMBER</pre> |
||
</li></ol> |
</li></ol> |
||
<div class="boxed"> |
<div class="boxed"> |
||
Latest revision as of 10:00, 16 April 2019
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.
-
Create a directory to store svn checkouts:
mkdir FILEPATH
-
Checkout the web scat repository to that location (cd there, then run below command):
svn co https://svn.zednax.com/svn/web_scat/trunk web_scat
-
Checkout the required repository to that location, for example zymonic core:
svn co https://svn.zednax.com/svn/zymonic/branches/qa zymonic-qa
-
Change the directory to the necessary repository:
cd zymonic-qa
-
Run the following merge command WITHOUT 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.