[Laszlo-dev] [UPDATE] Steps to integrate a change to a branch

[P T Withington]

[UPATE:  Add note to test a local build for risky integrations]

Re-open the the bug for the change to be integrated.  (The bug should  
already be fixed and verified in trunk.  The fix version should be the  
version of trunk where it was fixed, the fixed in change # should be  
the change in trunk where it was fixed [the last change if there were  
multiple fixes] and the fixed in branch should be trunk.)  Assign the  
bug to the branch manager with a comment requesting integration.

Have a clean branch sandbox:

 > svn revert -R .
 > svn up

Get the list of changes to be integrated, use svnmerge to integrate  
them:

 > svnmerge merge -b -r<changes> -S trunk

Look for conflicts, make sure the diff makes sense:

 > svn diff

If it looks like a risky integration, you might want to run a build  
and smokecheck locally before you check in, rather than waiting for  
the nightly build to fail..

Check it with the canned commit message created by svnmerge:

 > svn ci -F svnmerge-commit-message.txt

Note the revision of the check in, get the log:

 > svn log -v -r<checkin>

Resolve the bug you re-opened.  Set the Fix Versions to include the  
trunk and branch versions,  set Fixed in change # to the checkin you  
just made, set Fixed in branch to the branch, and past the check-in  
log as a comment

Pasting the check-in change in the log is VERY important because Fixed  
in change# only tracks the last change#.  You need all the comments to  
reconstruct the fix and integrate history, especially if there is more  
than one check-in involved in the fixed.