The File Compare window shows the contents of two files, one in the left and one in the right area of the window. A File Compare is typically invoked by Query|Show Changes from the Project Window but there are various other ways/windows to invoke a File Compare in SmartSVN.
Depending on the source of the compared files (local working copy, repository), none, only the right, or both contents may be editable. Depending on the invoking command, when a copied file is compared and the copy source file is removed, the pristine copy of the source file will be used for the comparison -- if its contents are available.
Tip |
If the file compare refuses to compare a file because it's binary, check the corresponding MIME-Type property. Regarding the used encoding, refer to Text File Encoding. See also system property smartsvn.compare.ignore-binary-mimetype for details. |
The file contents are compared line-by-line, where the underlying algorithm finds the minimum number of changed lines between the left and the right content. The differences between left and right content is highlighted by colored regions within the text views, which are linked together in the center Link Component. The Link Component allows to take over changes from one side to the other, depending on which side is editable.
Tip |
When the mouse is positioned over the Link Component, you can use the mouse wheel to jump from difference to difference. |
Depending on the Preferences, not only complete lines, but also the content within lines is compared if they are not too different. These comparison results in inner-line changes. You can take over such changes from left to right or vice versa by Apply Left resp. Apply Right from the popup menu (invoked on the change itself).
Regarding the following menus, many of the available operations are working on the active view, i.e. the view which has the focus resp. displays the cursor.
Contains well-known functions to alter the file content resp. to find a certain text within the content. Additionally:
Refer to Window for more details.