Compare with another branch or version

Since: M8
Last Modified: $Date: 2004/03/05 17:12:22 $

You should be able to select a project/folder/resource and compare againts another branch or version. Multi-select should work across projects in different repositories. Once the comparison is shown it should be possible to merge changes into the local workspace.

We should support multi-selection of files, but I'm not sure what should be shown to the user in those cases.

On file selected

Multiple selection

Entire contents of the folder are compared deep. If changes are found the user is notified and they are shown in a dialog. If no changes are found the user is notified. The dialog should allow the user to browse the changes and merge anything into his workspace. If the user wants to keep the comparison non-model, he can add it to the synchronize view. There is a button to do so on the compare dialog.

Merging changes

When the compare dialog is showing several changes you should be able to selectively merge anything into the local workspace. Specific attention should be made to the following cases: