We recently found an issue with the way we were doing merges between branches in Subversion... which was solved by telling Subversion to 'ignore ancestry' when computing the differences between branches.
I have updated the svnmerge script with this change, and installed the new version on the server that does automatic merging. Hopefully this will reduce or eliminate the 'false conflicts' that have been occurring when automerges have run in the past. I would kindly suggest that you update your local copies of svnmerge as well, just so you don't run into this problem :-) _______________________________________________ --Bandwidth and Colocation provided by Easynews.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
