Commit when out of sync

[Thomas Linder Puls]

I check-out files using the command line client from my IDE (this is not very efficient, but that is another story ).

When I want to commit my changes I use the GUI client.

Since check-out is not performed from the GUI client, the "Pending Change Set" is often out of sync.

If I commit while out of sync, I experience the following problem(s):

The commit does not commit everything (which is very unfortunate because that will very likely mean inconsistencies).

Moreover after the commit the "Pending Change Set" shows the remaining files, only now the "Commit" button is disabled.

I only know two ways to be able to commit the remaining files:

1. Stop and start the GUI client
2. Check-out additional files (the "Commit" button is still disabled, when I select the "remaining" files) press Commit and then select all files to be committed.

I will suggest that the "Pending Change Set" is always synchronized when "Commit" is pressed: It is very important that all changes are committed in a single transaction (the purpose of transactions must be to go from consistent to consistent states).

[sterwill]

When you say "if I commit while out of sync", do you mean that the files are in a Needs Merge state? If so, a dialog will appear offering an interactive merge (which will "sync" the files, also giving you the chance to approve the changes). I may have misunderstood what you meant by sync; if so, explain which items are not commited when you press the commit button.

Vault doesn't automatically merge Needs Merge files during commit for a few reasons. The first is that often the developer wants to perform this merge interactively (or by hand) so he's sure the file being checked in is logically consistent (will compile).

A second reason is that Vault doesn't know the scope of the changes in the Needs Merge files. Changes that might appear in the file after an automatic merge may reference changes in other parts of the tree, which would also need to be fetched in order for your local tree to be logically consistent.

If the commit button is ever disabled while items remain in the pending change set, this is a bug. It may be the same bug that's shown up in the past for other users (in many versions of Vault), without any apparent cause (and the button will never re-enable itself wtihout restarting Vault). If this is the case for you, let me know.

[Thomas Linder Puls]

No, by "out of sync" I mean that the list is not up-to-date in the GUI client.

I can bring it up-to-date by pressing F5. This has nothing to do with "Needs merge".

This is about a bug in Vault.