What does it mean to "Merge a Branch Forward"?

Merging forward is a way to keep old branches fresh and up-to-date. It consists of this process:

• Make sure your trunk working copy is clean
• Make sure all your existing branch changes are checked in
• Unbranch your existing branch. eg, for sprocket-212, you would execute:

  chbranch Divmod sprocket-212
  unbranch Divmod
  

• Resolve any conflicts and use "svn resolved"
• Create a new branch. eg:

  mkbranch Divmod sprocket-212-2
  

• Commit the new branch.
• Delete the old branch:

  svn rm svn+ssh://divmod.org/svn/Divmod/branches/sprocket-212 -m "Merged forward."
  

• Make sure to revert trunk working copy:

  svn revert Divmod/trunk -R
  

Merging forward is a component of our development methodology.