Manejando branches

Una gran forma de trabajar con el SVN es usando branches.
Si bien es la mejor forma de trabajar tiene algunas cosas que hacen tedioso el trabajo si varios usuarios usan el SVN tanto en el trunk como en sus branches.
Aca dejo un mini tutorial de como trabajar con branches.

Las 2 cosas a tener en cuenta son:

• Actualizar el branch con los ultimos cambios realizados en el trunk.
• Actualizar el trunk con los cambios realizados en el branch

Updating the branch

You've been developing for a while on your_branch, and so have other people on trunk, and now you have to add their changes to your_branch.

1. First, update your branch checkout and commit any outstanding changes.
2. Search the Subversion log to see at what revision number you last merged the changes (or when the original branch was made, if you’ve never merged). This is critical for making a successful merge:

svn log --limit 500 | grep -B 3 your_branch

3. Also note the current head revision:

svn info svn://alkhalid/tentacle/trunk | grep Revision

4. Merge the difference of the last merged revision on trunk and the head revision on trunk into the your_branch working copy:

svn merge -r LAST_MERGED_REVISION:HEAD_REVISION \
   svn://alkhalid/tentacle/trunk

Replace LAST_MERGED_REVISION with the revision number you noted in step 2, and HEAD_REVISION with the revision number you noted in step 3. Now look for errors in the output. Could all files be found? Did things get deleted that shouldn’t have been? Maybe you did it wrong. If you need to revert, run svn revert -R *.
5. Otherwise, if things seem ok, check for conflicts:

svn status | egrep '^C|^.C'

Resolve any conflicts. Make sure the application starts and the tests pass.
6. commit your merge.

svn ci -m "Merged changes from trunk to your_branch: COMMAND"

Replace COMMAND with the exact command contents from step 4.

Folding the branch back into trunk

Hey, your_branch is done! Now it has to become trunk, so everyone will use it and see how awesome it is.

This only happens once per branch.

1. First, follow every step in the previous section (“updating the branch”) so that your_branch is in sync with any recent changes on trunk.
2. Delete trunk completely:

svn del svn://alkhalid/tentacle/trunk

3. Move your_branch onto the old trunk location:

svn mv svn://alkhalid/tentacle/branch/your_branch \
   svn://alkhalid/tentacle/trunk

4. Relocate your working copy back to trunk:

svn switch --relocate \
   svn://alkhalid/tentacle/branch/your_branch \
   svn://alkhalid/tentacle/trunk