[Adium-devl] Merging Branches

[Augie Fackler]

Here's the recipe I came up with for merging SoC branches to trunk:

cd $BRANCH_WC
svn merge -r 20789:HEAD svn://svn.adiumx.com/adium/trunk
# Build - test anything needed (applescript branch should have unit  
tests run)
cd $TRUNK_WC
svn merge svn://svn.adiumx.com/adium/trunk \
  svn://svn.adiumx.com/adium/branches/summer_of_code_2007/bonjour
# Build - test anything needed (redundant - the code here should now be
# identical to the code present in the branch).

Note that you'll probably *really* want svn 1.5 for doing these -  
Bonjour had no conflicts (once I had the commands right) but I sort  
of expect the other branches to have conflicts. Also notice the line  
continuation in the second 'svn merge' command.

Note that 20789 is the revision I merged to the branches last week -  
that's why we use that number.

Peace,
Augie