Error checking in file after rollback

joel · Post by **joel** » Wed Jul 14, 2004 2:28 pm

I have a user who can't check in a changed file after a rollback was done earlier. He gets an error msg saying: "<filename> caused the transaction to fail. You must merge your working copy with the newest version before Check In can succeed". Now, the merge icon is disabled in the Pending Change Set dialog, so he can't merge the file at all. Trying this on other machines and on his machine after clearing the local Vault cache files doesn't work, so it appears to be a database problem. Once again, the list of actions is:

- rollback to previous version
- check out file
- make changes
- check back in
- receive error

Now, this only happens on this one file. He can check out and check in other files with no problems.

I've also tried getting a previous version of the same file and attempting to check it in. Then, I did get the merge dialog, but it still threw the same error message after I'd done the merge and attempted the checkin.

Any ideas?

Thanks,
Joel

dan · Post by **dan** » Wed Jul 14, 2004 3:02 pm

In theory, the rollback should be independant of the merge problem, but in practice there might be a problem there. (A rollback is just checkout at the rollback version and then a checkin on that version).

As a test, set a brand new working folder for that repository folder on a fresh machine, do a Get on just that file, then do a check out on the latest version of the file and then checkin, and see what happens. That should hopefully give definite results as to whether this is a client or server side issue.

joel · Post by **joel** » Wed Jul 14, 2004 3:42 pm

Done, and still receive the same error. That would indicate it's probably a server issue.

How should I proceed?

Thanks,
Joel

dan · Post by **dan** » Wed Jul 14, 2004 3:53 pm

We'll need to get jeffc involved, but he is out this afternoon - he will dig into the server side of it tomorrow. You might want to email him directly about it.

Thanks,