Content Comparison

...

1. Go to an up-to-date local distribution of trunk.
2. From the trunk distribution use the 'avail' command (above) to find the branch of interest.
3. Use the following command to find the revision(s) of interest:

   Code Block
   python svnmerge.py avail -S <your branch>

4. Import the changes from the branch into trunk:
   1. For all changes

      Code Block
      python svnmerge.py merge -S <your branch>

   2. For particular changes

      Code Block
      python svnmerge.py merge -r <your revisions comma separated> -S <your branch>

5. Resolve conflicts, compile, test and commit.

Elastic Bamboo

We currently have MySQL running on our Elastic Bamboo host for the purposes of integration testing. This is accomplished by the customise-extras.sh shell script which is run at boot time for the hosts.

...