Here is a very good (though somewhat long) article describing a deficiency in Subversion 1.5's merging support that has already bitten us:
http://blogs.open.collab.net/svn/2008/07/subversion-merg.html In short, the --reintegrate option does not work well together with Subversion's use of the svn:mergeinfo property for moved/renamed objects. If you are doing any merging from a feature branch back into trunk, you definitely should read this article. -- Jason Voegele Sleep -- the most beautiful experience in life -- except drink. -- W. C. Fields _______________________________________________ tc-dev mailing list tc-dev@lists.terracotta.org http://lists.terracotta.org/mailman/listinfo/tc-dev
