00:00:05this video demonstrates comparing
00:00:07documents or directories for an entire
00:00:09project using oxygen comparison tools to
00:00:12generate documents that highlight the
00:00:13differences detected between the two
00:00:16versions the resulting documents can be
00:00:19opened in oxygen XML editor with the
00:00:21track changes highlighted making it easy
00:00:23to review the changes and accept or
00:00:25reject them the resulting documents from
00:00:28the comparison can also be published to
00:00:30PDF or webel with the changes
00:00:32highlighted in case you prefer to review
00:00:34the differences in one of those formats
00:00:37the first part of the demonstration
00:00:38shows an example of processing a
00:00:40comparison of two versions of a single
00:00:42XML document while the second part shows
00:00:45a conceptual example of processing a
00:00:47comparison of directories for an entire
00:00:51project in the first part of the video
00:00:54I'll demonstrate using the merge
00:00:55documents with change tracking
00:00:57highlights tool to compare a pair of XML
00:01:00documents and merge them into a
00:01:01resulting separate document that has
00:01:03highlighted track changes that can then
00:01:05be reviewed and accepted or
00:01:08rejected for this demonstration I have a
00:01:11sample project that contains two main
00:01:13folders that represent two versions of
00:01:15the same file structure the space videos
00:01:18Branch folder contains various changes
00:01:21within the file structure while the
00:01:23space video's main folder represents the
00:01:25main version of the project I've made a
00:01:28copy of a document from from that main
00:01:30folder and I'll open it in the editor in
00:01:34my particular use case I want to compare
00:01:36it to another version of the same
00:01:37document in the other folder so that I
00:01:39can identify and review the changes
00:01:41using the change tracking feature and
00:01:43ultimately merge them back into the
00:01:45original document which is why I made a
00:01:48copy of it since I'll ultimately be
00:01:50overwriting the original file to invoke
00:01:53the merge tool I'll go to tools then
00:01:56comparison
00:01:58tools and I'll select merg documents
00:02:01with change tracking
00:02:03highlights in the resulting dialogue box
00:02:05it automatically selected the current
00:02:07document for the base document and I
00:02:10need to specify the URL of the
00:02:12corresponding document from the branch
00:02:14directory and click merge notice that
00:02:17the changes are tracked in the document
00:02:19and listed as track changes in the
00:02:20review view on the
00:02:22right I'll save the new document
00:02:25now overwriting the original
00:02:28document
00:02:33over in the review view I'll click on a
00:02:35few of the items that show that you can
00:02:37quickly navigate to each change and you
00:02:40could accept or reject each change
00:02:42individually or you can accept all
00:02:45changes at
00:02:46once I'll go ahead and undo
00:02:54that you could also reject all changes
00:02:57at
00:02:58once and again again I'll undo
00:03:01that and then I'll save it
00:03:04again now that I have this merg document
00:03:07that incorporates the change tracking
00:03:09markers I could also review the
00:03:11highlighted changes between the two
00:03:12versions in PDF format instead of
00:03:14reviewing them in oxygen Editor to do so
00:03:17I would need to apply a PDF
00:03:19transformation on the document that
00:03:20resulted from the merge
00:03:22process so I'll click the configure
00:03:25transformation scenarios button on the
00:03:27toolbar I'll select the did a PDF based
00:03:31on HTML 5 and CSS scenario and duplicate
00:03:34it so that I can make
00:03:37changes to show the change tracking
00:03:39markers in the output some parameters
00:03:41need to be set so I'll go to the
00:03:43parameters Tab and I'll use the filter
00:03:45fi to narrow the list all three of these
00:03:48parameters must be set to the value of
00:03:51yes once finished I'll click
00:03:56okay and I'll apply the configured
00:03:59scenario
00:04:01once the transformation is complete the
00:04:03document automatically opens in your
00:04:05default PDF viewer I'll open the
00:04:08comments View and my viewer to show that
00:04:10the changes are listed as track changes
00:04:12similarly to Oxygen's review view I can
00:04:15hover over the colored markers within
00:04:17the document to see a tool tip that
00:04:19describes the type of
00:04:21change note that the fragments with
00:04:23detected changes also have a gray
00:04:24vertical bar to the left and the changed
00:04:27content appears between curly brackets
00:04:29and is is colored red or blue depending
00:04:31on whether the type of change is a
00:04:33deletion or
00:04:34insertion in the second part of the
00:04:37video I will demonstrate using the merge
00:04:39directories with change tracking
00:04:40highlights tool to compare and merge a
00:04:43pair of directories and all of the files
00:04:45involved in the process are saved as
00:04:47separate documents with highlighted
00:04:49track changes that can then be reviewed
00:04:51and accepted or rejected I'm using the
00:04:54same sample project as in the first
00:04:57chapter it contains two main folders
00:04:59that represent two versions of the same
00:05:01file structure the branch folder
00:05:04contains various changes within the file
00:05:06structure while the main folder
00:05:07represents the original or main version
00:05:09of the project I want to compare the two
00:05:12directories so that I can identify and
00:05:14review any changes between any of the
00:05:16files within the directories using the
00:05:18change tracking
00:05:20feature to invoke the merge tool I'll go
00:05:23to tools then comparison
00:05:26tools and I'll select merge directories
00:05:28with change track
00:05:30highlights in the resulting dialogue box
00:05:33I need to specify the base directory the
00:05:36directory to merge with and an output
00:05:39directory where the results of the
00:05:40process will be
00:05:42saved there are also some merge options
00:05:45that I will now
00:05:46explain for the options that are already
00:05:49selected the enabled update the modified
00:05:51non-xml files option results in all
00:05:54files in the output directory that are
00:05:56copies of non-xml files in the base
00:05:58directory being being replaced by their
00:06:00corresponding files in the directory to
00:06:02merge with otherwise they remain
00:06:05unchanged the enabled add the files
00:06:07found only in the directory to merge
00:06:09with option results in all files that
00:06:11are only present in the directory to
00:06:13merge with being added to the output
00:06:16directory the enabled delete the files
00:06:18found only in the base directory option
00:06:20results in all files that are only
00:06:22present in the base directory and
00:06:24initially copied to the output directory
00:06:26being deleted and the enabled open the
00:06:29operation report file and editor option
00:06:32opens the resulting merge operation
00:06:33report in the
00:06:36editor I'll also select the create
00:06:39change tracking markers for the xmo
00:06:41files to be added option you would
00:06:43select this option if you want to create
00:06:45change tracking markers for the XML
00:06:47files that are only present in the
00:06:49directory to merge with and will be
00:06:51added to the output directory although
00:06:54these files have no counterparts in the
00:06:56base directory change tracking markers
00:06:58of the type entire content added or
00:07:00inserted will be
00:07:02created this option is not necessarily
00:07:05intended for the merge process itself
00:07:07but it is useful if you want to apply
00:07:09oxygen transformation scenarios to the
00:07:11resulting output directory as you will
00:07:13see in a few
00:07:15minutes after the merge process is
00:07:17finished the operation report is opened
00:07:19in the
00:07:20editor and now I'll offer a bit of
00:07:23explanation of the
00:07:24report the first group of URLs listed
00:07:27represents the group of XML files
00:07:29detected as modified and merged with
00:07:31change tracking highlights you can click
00:07:34on a URL to open the file in the editor
00:07:37you can see that the changes are tracked
00:07:39in the document and listed as tracked
00:07:41changes in the review view on the
00:07:44right going back to the report the next
00:07:47non-xml file section would contain files
00:07:49from the base directory that were
00:07:51replaced by their corresponding files in
00:07:53the directory to merge with there were
00:07:55none in my
00:07:57case the next section contains the XML
00:07:59files that were initially present only
00:08:02in the directory to merge with I'll
00:08:04click on one of these URLs to open it in
00:08:06the
00:08:07editor since I enabled the option called
00:08:10create change tracking markers for the
00:08:12XML files to be added you can see that a
00:08:15single change tracking marker was
00:08:17created that adds the entire content of
00:08:19the file I can accept the change just
00:08:21like any other track
00:08:23change and I'll save the
00:08:27file back to the report the next group
00:08:30is non-xml files initially present only
00:08:32in the directory to merge with and they
00:08:35were also copied to the output
00:08:37directory clicking one of these URLs
00:08:39will open it in the appropriate system
00:08:41application such as the image viewer in
00:08:44this
00:08:45case the last section represents the
00:08:48group of files from the base directory
00:08:50that no longer have counterparts in the
00:08:52directory to merge with the links work
00:08:54for them as well opening the associated
00:08:56files from the base directory and the
00:08:58editor now since this dat map is from
00:09:01the merge directory that resulted from
00:09:03the merge process I can apply an oxygen
00:09:05PDF transformation on the map to see
00:09:08highlighted changes between the compared
00:09:10versions in PDF format instead of using
00:09:12Oxygen's editor so in the datam maps
00:09:15manager I'll click the configure
00:09:17transformation scenarios button and I'll
00:09:20select the data map PDF based on HTML 5
00:09:24and CSS scenario and duplicate it so
00:09:27that I can make changes I'll go to the
00:09:30parameters Tab and I'll use the filter
00:09:32field to narrow the list all three of
00:09:35the parameters must be set to the value
00:09:37of
00:09:38yes once finished I'll click
00:09:43okay and apply the
00:09:50scenario once the transformation is
00:09:52complete the document should
00:09:53automatically open in your default PDF
00:09:56viewer you can already see that the
00:09:58change tracking markers are visible I'll
00:10:01navigate to a document that was added
00:10:03during the merge process it was not
00:10:06previously present in the main directory
00:10:08and the entire content of the document
00:10:10is inserted in an auto merger type of
00:10:13track change as you can see when I hover
00:10:15over the colored
00:10:19marker you could also use a webel
00:10:21transformation to view the highlighted
00:10:23changes in an HTML format so I'll click
00:10:26the configure transformation scenarios
00:10:28button and this time I'll select the
00:10:30datam map webel responsive scenario and
00:10:34duplicate it so that I can make
00:10:36changes I'll go to the parameters Tab
00:10:38and I'll use the filter fill to narrow
00:10:41the
00:10:41list for the web help transformation
00:10:44this particular parameter needs to be
00:10:46set to
00:10:47yes once finished I'll click
00:10:51okay I'll disassociate the PDF scenario
00:10:55and apply the webel
00:10:58one
00:11:00once the transformation is complete the
00:11:02webel output is opened in your default
00:11:04browser I'll navigate to a few topics
00:11:07that have
00:11:09changes and you can see that the track
00:11:11changes are highlighted in the webel
00:11:13version as
00:11:14well that concludes this demonstration
00:11:17of Oxygen's tools for comparing and
00:11:19merging documents and directories while
00:11:21utilizing change tracking highlights as
00:11:23always thank you for
00:11:28watching but