Subversion, is of no help at all in tracking what has been merged from one branch to another so the risk of double-merging is very high.
http://www.dellroad.org/svnmerge/index claims to be a tool to record merges in svn properties automatically avoid double merges etc. It's been adopted by tigris and is part of the svn distribution (although not installed by the fedora RPM package I have.) Anyone have any experience with this? If its any good it would be worth adopting for qpid. Anyone know of better solutions to managing merges on svn? Cheers, Alan.
