To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=59372
User hr changed the following:
What |Old value |New value
================================================================================
Status|NEW |RESOLVED
--------------------------------------------------------------------------------
Resolution| |INVALID
--------------------------------------------------------------------------------
------- Additional comments from [EMAIL PROTECTED] Thu Dec 15 07:16:57 -0800
2005 -------
Hi Volker,
I would rather like to not change the current behaviour, for consistency and
safety reasons.
Moving the anchor tag (in the following commit step) here means that an implicit
decision has been made regarding the binary file (wether to take the one from
the MWS or the CWS or something else), even in the case if the owner missed the
required action (conflict resolve). This is different for text files, where a
missed required action (conflict resolve) triggers in nearly all cases an error
during commit and in any case renders a file syntactically invalid which works
well for all kind of parsed files.
Consider the following scenario:
Binary file has been changed on MWS and on CWS. MWS change supercedes the one in
CWS and is the one which should have been taken. Developer forgets to take the
one from MWS into his CWS during resync, but the anchor tag is moved. Suppose no
other changes are done to this binary file. It will not pop up again during the
next resync (ANCHOR_TAG has been moved). It will not pop up during the
integration, because the integration tool sees that there is no change between
anchor tag and top, so it will just know that the one on the CWS is the right
one. The binary file from CWS goes unchecked into the MWS ... !BOOM!.
The rationale behind the anchor tag for binary files is: If there is no change
for the binary file on the MWS but a change on the CWS then you can be sure that
the one on the CWS is the right one, because the developer had the original
file, found it lacking, changed it. He wouldn't have done it if the MWS file
would have been right. No further checks needed. The very moment changes are
done to both the MWS and the CWS version this rationale breaks done and you can
just make sure that checks are done at every further step along the live time of
the CWS. This is best ensured by not moving the anchor tag because the file will
then give alerts on each resync and at integration time.
---------------------------------------------------------------------
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]
