To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97012
------- Additional comments from [EMAIL PROTECTED] Tue Dec 9 21:54:24 +0000 2008 ------- Some comments from a Subversion developer. Hopefully this information will help you guys. This really is the behaviour of 'svn move' as implemented. We know this sucks in many situations. The 1.6 release will feature 'tree-conflict detection', a feature which is supposed to address this and a whole class of similar problems. I'm not really sure what you do during a 'rebase' and what the cws tool is, so it might be that the issues we are trying to fix with this feature are orthogonal to your problem. But I hope that's not the case. Some background reading: Slides for a talk I did with a fellow svn developer at Subconf: http://www.subconf.de/fileadmin/PDF_Dateien/SubConf/SubConf_2008/Vortraege/Stephen_Butler_und_Stefan_Sperling.pdf Slides for a talk at Subconf held by a corporate Subversion user with extreme branching and merging requirements, about their (temporary) workaround for problems with svn move: http://www.subconf.de/fileadmin/PDF_Dateien/SubConf/SubConf_2008/Vortraege/Nico_Schellingerhout1.pdf Unfortunately, we're currently lacking decent documentation for tree conflicts. Much information is scattered on the mailing list and in our issue tracker. The svnbook will eventually be updated, I'm working on this. These two posts may give you a good idea about what this feature does: http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=98875&dsForumId=462 http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=99602&dsForumId=462 If you really want to dig deep, here is the mother issue in our issue tracker: http://subversion.tigris.org/issues/show_bug.cgi?id=2282 Most importantly, if you can, *please* *please* *please* try your problematic merge cases with current Subversion trunk, and report to us on our development mailing list (see http://subversion.tigris.org/mailing-lists.html) whether you like what you see or not. (It's all client-side, not need to upgrade the server.) That would help us an awful lot. Thanks! --------------------------------------------------------------------- Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
