Page Comparison

...

1. Download svnmerge.py
2. Make a branch directory for yourself (you'll only need to do this once)

   Code Block
   svn mkdir https://sagebionetworks.jira.com/svn/PLFM/branches/deflaux

3. Make a new branch from trunk

   Code Block
   svn copy https://sagebionetworks.jira.com/svn/PLFM/trunk https://sagebionetworks.jira.com/svn/PLFM/branches/deflaux/automatedIntegrationTesting

4. Have both trunk and your new branch on your local hard drive, this assumes you already have trunk checked out in directory ~/platform

   Code Block
   cd ~/platform svn update trunk svn checkout https://sagebionetworks.jira.com/svn/PLFM/branches/deflaux/automatedIntegrationTesting

5. Initialize merge tracking

   Code Block
   cd trunk svnmerge.py init ../automatedIntegrationTesting svn commit -F svnmerge-commit-message.txt cd ../automatedIntegrationTesting svnmerge.py init ../trunk svn commit -F svnmerge-commit-message.txt

Alternative: Initialize merge tracking and switch to your new branch

cd trunk
svnmerge.py init https://sagebionetworks.jira.com/svn/PLFM/branches/deflaux/sts
svn commit -F svnmerge-commit-message.txt
svn switch https://sagebionetworks.jira.com/svn/PLFM/branches/deflaux/sts
svnmerge.py init https://sagebionetworks.jira.com/svn/PLFM/trunk
svn commit -F svnmerge-commit-message.txt

How to merge

Merge from trunk to your branch

...