Not sure how many people here used the CVS merge functionality when committing to a branch & trunk or to multiple branches. If you did you may have noticed that SVN's merge support is less than stellar.
I've started using svnmerge ( http://www.orcaware.com/svn/wiki/Svnmerge.py ) which uses properties to keep track of revisions that have and have not been merged between branches. The wiki page they have gives good examples of common use cases and can make moving changes between branches much easier. People are welcome to use this to facilitate merges and post questions about the tool here if you have them. -Eric
smime.p7s
Description: S/MIME Cryptographic Signature
