VideosOxygen Diff and Merge Support in Eclipse

Overview

This video presents the file comparison support that is integrated in the Eclipse distribution of Oxygen XML Editor.

Transcript

00:00:06Oxygen XML Editor for the Eclipse  plugin includes a file comparison  
00:00:10tool that provides a mechanism for  comparing XML-related resources  
00:00:14in a visual mode or text-based mode. Some of the benefits include:  
00:00:19The visual file comparison mode makes it easy  to see how the compared changes will look in  
00:00:24the final output, including modifications  made with change tracking enabled.  
00:00:29Meanwhile, the Text-based comparison  mode makes it easy to identify the exact  
00:00:33structural changes in your XML documents. You can use various comparison algorithms  
00:00:39and ignore content that is not  important in the comparison.  
00:00:43It automatically performs a second-level  comparison so that you can see  
00:00:47changes inside modified blocks. It’s integrated with the Eclipse  
00:00:51comparison support. You can compare versions  
00:00:55in the Workbench with versions in the  repository or local edit history.  
00:00:59And you can compare three files  when a common ancestor exists.  
00:01:04Now I’ll show you some of the features in  action. If you use a versioning system, you  
00:01:09can compare files directly from the Synchronize  view. I have a file here that shows there are  
00:01:15some changes in the repository and I just need  to double-click it to open the comparison.  
00:01:22Notice that it automatically opened  the comparison in the visual mode  
00:01:26where I can see how the compared changes  will look in the final output.  
00:01:30It includes some unique features, such as  a toolbar button to specify the type of  
00:01:35tags to display in the visual comparison mode. Notice that it presents changes at word level.  
00:01:44It even presents differences made  with Change Tracking enabled.  
00:01:50You can navigate changes using the  highlights in the vertical stripe or  
00:01:54using navigation buttons on the toolbar.  It also has actions to copy specific  
00:02:01individual changes … OR all non-conflicting  changes from one side to the other.  
00:02:10It includes a text-based comparison mode and you  can switch to it by using a toolbar button.  
00:02:16Most of the options, features, and actions that  are available for the visual-based mode are also  
00:02:21available in the Text comparison mode. It also includes a set of diff options.  
00:02:28For example, you can choose from  various different algorithms for  
00:02:332-way comparisons … or 3-way comparisons... or you can specify whether or not namespaces,  
00:02:43prefixes, namespace declarations, or the  order of attributes should be ignored.  
00:02:51You can also trigger the comparison  tool from the Project Explorer view.  
00:02:55I have 3 local files here that I  want to compare, so I’ll select them,  
00:02:59right-click, and since it’s a 3-way comparison, a dialog box prompts me to select which one is the  
00:03:05common ancestor (or base). And, again, the comparison is  
00:03:10automatically started in the visual mode,  but you can switch to the text-based mode.  
00:03:17So, your XML-related content can be  compared directly in Eclipse using  
00:03:21either the visual or text-based modes, it’s very easy to switch back and forth  
00:03:26between the two, and both modes include various  options for controlling the comparisons.  
00:03:32This concludes the demonstration.  As always, thanks for watching.