Files in conflict have commit and shelve actions

[Alexander Taler]

When a file is in a conflict state (e.g. from an update) the shelve and commit actions should not be available for it. Bazaar will refuse to commit a file in conflict, but apparently will allow it to be shelved which seems like a Bazaar bug.

In bzr-eclipse those actions should be greyed out.

[Alexander Taler (alex-idereal)]

In fact, commit actions should be greyed out everywhere as long as there's a file in conflict, because Bazaar will refuse to commit.

[Piotr Piastucki (piastucki)]

I think there is nothing wrong in using shelve with files in conflict.
As for the commit action, I agree it should be disabled as long as there is at least 1 conflict in the branch. However, this means we will need to get the list of conflict on each right click and this will impact the user experience.
Maybe we can simply disable the OK button in the commit dialog? Or show a warning box informing the user about the conflicts instead?

[Piotr Piastucki (piastucki)]

I left shelve action as it is. Commit action will show a warning instead of the commit dialog if there are any conflicts found among the selected resources.