Merge Failed after FailFileInvalidCheckSum

[SergeM]

Hi All,
I posted a previous error where by some java source files could not be committed due to a FailFileInvalidCheckSum error. The default behaviour for 2.0.6 (on XP SP2, running .NET 1.1) is to set EOL conversion to Unix LF. Since I am using Eclipse as my Java ide, this is probably creating unix style source files.
If I then change EOL conversion to any other value, the client states that I need to merge. When I attempt to do so, I get the following error dialog:

[img]E:\Error.JPG[/img]

The Log trace is :

[22/09/2004 12:57:30 PM] Preparing data to begin transaction
[22/09/2004 12:57:30 PM] Beginning transaction
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/SocketInput.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/WebMethodsQueue.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/listener/Listener.java
[22/09/2004 12:57:30 PM] Ending the transaction
[22/09/2004 12:57:30 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:30 PM] Found and corrected problems with the a local baseline file. Retrying the transaction.
[22/09/2004 12:57:30 PM] Preparing data to begin transaction
[22/09/2004 12:57:30 PM] Beginning transaction
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/SocketInput.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/WebMethodsQueue.java
[22/09/2004 12:57:30 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/listener/Listener.java
[22/09/2004 12:57:30 PM] Ending the transaction
[22/09/2004 12:57:36 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:36 PM] Server unavailable for transaction end
[22/09/2004 12:57:36 PM] Transaction failed
[22/09/2004 12:57:36 PM] Transaction failed
[22/09/2004 12:57:43 PM] Preparing data to begin transaction
[22/09/2004 12:57:43 PM] Beginning transaction
[22/09/2004 12:57:43 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/SocketInput.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/WebMethodsQueue.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/listener/Listener.java
[22/09/2004 12:57:44 PM] Ending the transaction
[22/09/2004 12:57:44 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:44 PM] Found and corrected problems with the a local baseline file. Retrying the transaction.
[22/09/2004 12:57:44 PM] Preparing data to begin transaction
[22/09/2004 12:57:44 PM] Beginning transaction
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/SocketInput.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/WebMethodsQueue.java
[22/09/2004 12:57:44 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/listener/Listener.java
[22/09/2004 12:57:44 PM] Ending the transaction
[22/09/2004 12:57:45 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:45 PM] Server unavailable for transaction end
[22/09/2004 12:57:45 PM] Transaction failed
[22/09/2004 12:57:45 PM] Transaction failed
[22/09/2004 12:57:51 PM] Preparing data to begin transaction
[22/09/2004 12:57:51 PM] Beginning transaction
[22/09/2004 12:57:51 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:51 PM] Ending the transaction
[22/09/2004 12:57:51 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:51 PM] Found and corrected problems with the a local baseline file. Retrying the transaction.
[22/09/2004 12:57:51 PM] Preparing data to begin transaction
[22/09/2004 12:57:51 PM] Beginning transaction
[22/09/2004 12:57:51 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:51 PM] Ending the transaction
[22/09/2004 12:57:52 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/Connection.java
[22/09/2004 12:57:52 PM] Transaction failed
[22/09/2004 12:57:52 PM] Server unavailable for transaction end
[22/09/2004 12:57:52 PM] Transaction failed
[22/09/2004 12:58:14 PM] Preparing data to begin transaction
[22/09/2004 12:58:14 PM] Beginning transaction
[22/09/2004 12:58:14 PM] Delete $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/GBSTReceiver.java
[22/09/2004 12:58:14 PM] Delete $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/GBSTSender.java
[22/09/2004 12:58:14 PM] Ending the transaction
[22/09/2004 12:58:14 PM] Transaction completed successfully
[22/09/2004 12:58:19 PM] Preparing data to begin transaction
[22/09/2004 12:58:19 PM] Beginning transaction
[22/09/2004 12:58:19 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:58:19 PM] Ending the transaction
[22/09/2004 12:58:19 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:58:20 PM] Found and corrected problems with the a local baseline file. Retrying the transaction.
[22/09/2004 12:58:20 PM] Preparing data to begin transaction
[22/09/2004 12:58:20 PM] Beginning transaction
[22/09/2004 12:58:20 PM] Check in $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:58:20 PM] Ending the transaction
[22/09/2004 12:58:21 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:58:21 PM] Transaction failed
[22/09/2004 12:58:20 PM] Server unavailable for transaction end
[22/09/2004 12:58:20 PM] Transaction failed
[22/09/2004 12:58:30 PM] Preparing data to begin transaction
[22/09/2004 12:58:30 PM] Beginning transaction
[22/09/2004 12:58:30 PM] Changed file properties for $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:58:30 PM] Ending the transaction
[22/09/2004 12:58:30 PM] Transaction completed successfully
[22/09/2004 12:58:30 PM] Refreshing folder tree
[22/09/2004 12:58:30 PM] Folder tree refreshed
[22/09/2004 12:58:38 PM] Preparing data to begin transaction
[22/09/2004 12:58:38 PM] Beginning transaction
[22/09/2004 12:58:38 PM] Item $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java caused the transaction to fail: You must merge your working copy with the newest version before Check In can succeed.
[22/09/2004 12:58:38 PM] Transaction failed
[22/09/2004 12:59:08 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:59:08 PM] An error was found with the baseline file for $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java. Refetching baseline and retrying get operation...
[22/09/2004 12:59:08 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:59:08 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:59:32 PM] Preparing data to begin transaction
[22/09/2004 12:59:32 PM] Beginning transaction
[22/09/2004 12:59:32 PM] Changed file properties for $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:59:32 PM] Ending the transaction
[22/09/2004 12:59:32 PM] Transaction completed successfully
[22/09/2004 12:59:32 PM] Refreshing folder tree
[22/09/2004 12:59:32 PM] Folder tree refreshed
[22/09/2004 12:59:37 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:59:37 PM] An error was found with the baseline file for $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java. Refetching baseline and retrying get operation...
[22/09/2004 12:59:37 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java
[22/09/2004 12:59:37 PM] Fetched $/Macquarie/MML/GBSTListener/src/com/macquarie/mml/eai/gbst/common/LoggingHandler.java

Any suggestions welcome

Serge Merzliakov

[jeremy_sg]

Serge,

I think that the problem is that you tried to do a checkin immediately after changing LogginHandler.java's EOL property. Changing a property results in a new version number for the file (so that the file goes to Needs Merge status), and Vault will only allow a checkin if the status is Edited. To fix the problem, get latest on the file choosing to Attempt Automatic Merge. That will update the baseline version of the file to Latest, and allow you to check in your changes.

[jeremy_sg]

Serge,

After some more investigation, I can definitely confirm that this is a bug with the baseline correction code. I've fixed the problem for Vault 2.1, which will be released in the late fall.