To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=83673 Issue #|83673 Summary|cwsresync -m overlooks merge conflicts Component|tools Version|680m233 Platform|All URL| OS/Version|All Status|NEW Status whiteboard| Keywords| Resolution| Issue type|DEFECT Priority|P3 Subcomponent|solenv Assigned to|hr Reported by|hjs
------- Additional comments from [EMAIL PROTECTED] Thu Nov 15 16:37:10 +0000 2007 ------- i two times had the effect while resyncing that a merge conflict was reported as clean merge. first time a single file merge (solenv/bin/modules/installer/systemactions.pm m235 -> m237), second time a module merge (config_office/configure m233->m237) where two othere conflicts were detected properly. no clue what the pattern may be. --------------------------------------------------------------------- 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]
