Page Comparison

...

1. Ensure the branch is working and committed to SVN.
2. To see what changes and/or branches are available for importing, use this command from the branch distribution:

   Code Block
   python svnmerge.py avail -l

   • Windows Users: One of the results should be '/PLFM/trunk'.
3. import the changes from trunk into the branch:
   • to merge all changes

     Code Block
     python svnmerge.py merge -S /PLFM/trunk

   • to merge one or more particular changes

     Code Block
     python svnmerge.py merge -r #,#,#

     Windows Users: to merge all changes

     Code Block
     python svnmerge.py merge -S /PLFM/trunk

4. Resolve conflicts, compile, test and commit EVERYTHING in the branch.

   Code Block
   svn ci -F svnmerge-commit-message.txt

...