Comparison window
The results of the comparison of the two projects/files are displayed in the comparison windows. There are three different comparison views, which are explained below. If the comparison of single files has been initiated (e.g. by command line or via the source control client), the corresponding comparison window opens directly. If two TwinCAT projects have been selected for comparison, the TcProjectCompare starts with the comparison windows of the TwinCAT 3 project (see TwinCAT3 project comparison window).
Handling the status information in the comparison windows:
The status information for the current comparison is located on the left-hand side of the toolbar in the comparison windows. It indicates how many additions, deletions and changes have been found. It always refers to a comparison starting from the left-hand side, as that is the side in which contents are merged.
Example of the status display after a comparison:
Starting from this example, this would be:
- No contents, which are present on the left-hand side, but not on the right-hand side.
- One entry that is present on the right-hand side, but not (yet) on the left-hand side.
- Once change in an entry
In the comparison editors, the changes are displayed in the same colors as the status bar, so that it can immediately be seen whether an addition, deletion or change is concerned.
Note | |
Unwanted deletion of contents when accepting additions Additions show changes that exist on the left-hand side, i.e. on the side on which merging is to take place. Since this is the side that is currently being edited, the contents are mostly new contents of its own. However, the merging (acceptance of changes) refers to the right-hand side of the comparison window. This may contain changes by third parties or in comparison with old project versions. Since merging takes place from the right-hand side to the left-hand side, the non-existence on the right-hand side of the comparison window is therefore accepted when accepting an addition. In other words, the content of an addition is deleted upon acceptance. |