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] Mon Dec 8 15:18:10 +0000 2008 ------- There are at least three scenarios: Scenario I: - move on cws - change on trunk - rebase -> trunk changes ignored Scenario II: - move on cws - reintegrate -> trunk changes from last rebase before move ignored/reverted Scenario III: - change on cws - move on trunk - rebase -> cws changes ignored/reverted An clumsy way to solve this would be to create a svn property "milestone" set on every file on every milestone to something like "DEV300_mXX" Upon cws create those properties are set to "cws" or cleared. After a rebase, one could identify files (from Scenario III) moved on master by their milestone tag. Those files would need to be examined, conflicts need to be resolved and the "milestone" property would need to be set to "cws" again. This would work the same way for Scenario II. Still, it wouldnt solve Scenario I, and emulating cvs tags like that probably would result in a huge performance hit. --------------------------------------------------------------------- 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]
