Merging to QA: Difference between revisions

Content added Content deleted

Inline

Revision as of 15:25, 12 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:
```
sudo mkdir FILEPATH
```
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
```
Checkout the required repository to that location, for example zymonic core:
```
sudo 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:

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.

@@ Line 2: / Line 2: @@
 <div class="boxed">
 <b>The first time will take a while to download and cache the full svn log that it needs to work from.<br/>
-If you get anything you don't understands or any conflicts then let a senior developer know.<br/>
+If you get anything you don't understand or any conflicts then let a senior developer know.<br/>
 Whatever you do don't just carry on if it doesn't look quite right, this can have undesired effects.</b><br/>
 </div><br/>
@@ Line 24: / Line 24: @@
 <b>Once again, to reiterate:</b><br/>
 The first time will take a while to download and cache the full svn log that it needs to work from.<br/>
-If you get anything you don't understands or any conflicts then let a senior developer know.<br/>
+If you get anything you don't understand or any conflicts then let a senior developer know.<br/>
 Whatever you do don't just carry on if it doesn't look quite right, this can have undesired effects.<br/>
 </div>