truMerge is a merge helper tool that combines true rename functionality with Subversion merge, in order to handle tree conflicts more reliably and effectively.

Do not be fooled by the name: truMerge is by no means "the truth" in merging (we believe that in due course, Subversion will blow truMerge out of the water). However, we find it useful and to be a significant improvement over Subversion's current merge for archives that undergo a lot of tree restructuring.

"svnbr" is a Subversion utility to operate branches.

Usage: svnbr <subcommand> [<option>] [<args>]

<branch-name> : /branches/<branch-name> or trunk
<tag-name> : /tags/<tag-name>

1. list branches
> svnbr [list | branches]

2. list tags
> svnbr tags

3. switch to branch or tag after craete /branches/<branch-name> (if missing)
> svnbr sw <branch-name> [--from-tag=<tag-name>]
> svnbr sw <tag-name>

4. create /tags/<tag-name>
> svnbr tag <tag-name>

5. delete branch or tag
> svnbr (del | rm) (<branch-name> | <tag-name>)

6. move branch or tag (if force)
> svnbr mv <old-branch-name> <new-branch-name>
> svnbr mv (--force | -f) <tag-name> <branch-name>

7. view log
> svnbr log [<branch-name> | <tag-name>]

8. merge
> svnbr merge (<branch-name> | <tag-name>) -c M[,N...]
> svnbr merge (<branch-name> | <tag-name>) -r M:N

9. diff
> svnbr diff (<branch-name> | <tag-name>) <file>

Subversion Merging Using the svn-resolve script

The script itself

The only requirements for this script to work is that you have OS X developer tools installed (specifically filemerge.app). I chmod'd and added the file to ~/bin which is in my environment path. Usage is pretty simple
svn-resolve ./
which will open up a filemerge.app window for each and every conflict it finds. Pretty sweet!