02.05.2013 Views

User Guide - MKS

User Guide - MKS

User Guide - MKS

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

Chapter 6: Member Operations<br />

Comparing Differences<br />

192<br />

After you have made changes to a member’s working file, you usually<br />

check those changes back into the member history as a new revision. But<br />

you may also decide that those changes should be discarded. Before you<br />

make this decision, you have to be able to view the changes that you are<br />

checking in, or those that you are discarding if you choose.<br />

Source Integrity Visual Difference allows you to view the differences<br />

between the member’s working file and its member revision. You can also<br />

select two specific revisions and compare them. For information on<br />

comparing revisions, see “Comparing Revisions” on page 301.<br />

You can also compare differences between your checked out working file<br />

and the locked revision through the Check In dialog. For details on viewing<br />

differences through the Check In dialog, see “Checking In a Member” on<br />

page 172.<br />

Source Integrity allows you to use a third party differencing tool, in the<br />

graphical user interface, if you do not want to use Visual Difference. You<br />

can specify a third party difference tool in your preferences. For<br />

information on setting up third party differencing tools, see “Difference<br />

Tool Preferences” on page 66.<br />

NOTE<br />

In the Source Integrity Web interface you cannot compare a working file to its<br />

member revision but you can compare revision differences. For information on<br />

comparing revisions, see “Comparing Revisions” on page 301.<br />

For information on merging revisions, see “Merging Revisions” on<br />

page 322 or “Branching and Merging Revisions” on page 305.<br />

To compare a member’s working file to its member revision in the<br />

graphical user interface<br />

1 With a Sandbox window open, select a member that has a modified<br />

working file (indicated by a working file delta ), or a member that<br />

has a new revision available (indicated by a member delta ).<br />

2 Do one of the following:<br />

Select Member > Diff/Merge > Differences.<br />

Click .<br />

u s e r g u i d e

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!