Compare Code with Previous Versions

Easily compare the current version of a file with a previous version using the Compare With feature. In the Project Explorer, right-click on the file you want to compare, then select Compare with... → Local History from the pop-up menu, as shown below:

ed_localhist01.gif

The History View appears in the same area as the Console View. The History View displays the recent history of the document. The most recent version is shown in bold type, as shown in the following example:

ed_localhist02.gif

Double-click on the version that you want to compare with the current saved version. The IDL Editor displays both versions side by side for quick comparison. In the example below, the left side shows the current version, and the right side shows the history file that was selected to compare.

ed_localhist03.jpg

Use the navigation tools in the upper right corner of the Editor window to view and save any changes from one document to the other.

ed_compare_copyr2l.gif
Copy all non-conflicting changes from right to left

Copies all the non-conflicting changes from the right pane into the left pane. Conflicting changes must be copied individually. (Conflicting changes happen when multiple people edit the file.)

ed_compare_copycurrent.gif
Copy current change from right to left

Merges changes by copying the highlighted change in the right pane into the highlighted fragment on the left.

ed_compare_nextdiff.gif
Next difference

Highlights the next difference found between the compared files.

ed_compare_prevdiff.gif
Previous difference

Highlights the previous difference found between the compared resources.

ed_compare_nextchange.gif
Next change

Highlights the next change found between the compared resources.

ed_compare_prevchange.gif
Previous change

Highlights the previous change found between the compared resources.