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.

Table of Contents<br />

9 Viewing and Editing Member Histories and Revisions . 279<br />

Viewing a Member History . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 280<br />

Viewing and Editing Archive Information . . . . . . . . . . . . . . . . . . . . 282<br />

Viewing and Editing Revision Information . . . . . . . . . . . . . . . . . . . 284<br />

Viewing an Annotated Revision . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 286<br />

Viewing and Editing Revision Labels . . . . . . . . . . . . . . . . . . . . . . . . 288<br />

Adding Revision Labels . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 290<br />

Deleting Revision Labels . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 291<br />

Viewing a Member’s Working File or Revision . . . . . . . . . . . . . . . . 291<br />

Promoting Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 292<br />

Demoting Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 293<br />

Locking Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 294<br />

Unlocking Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 295<br />

Locking Multiple Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 296<br />

Managing Revision Locks . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 298<br />

Setting the Member Revision . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 300<br />

Deleting Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 301<br />

Comparing Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 301<br />

10 Branching and Merging Revisions . . . . . . . . . . . . . . . . . 305<br />

Branching Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 306<br />

Making Locked Members Writable . . . . . . . . . . . . . . . . . . . . . . . . . . 308<br />

Merging Branched Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 311<br />

Merging on Check In . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 311<br />

Merging Revisions by Dragging . . . . . . . . . . . . . . . . . . . . . . . . . 316<br />

Automatic Merging on Check Out . . . . . . . . . . . . . . . . . . . . . . . 319<br />

Automatic Merging on Resync . . . . . . . . . . . . . . . . . . . . . . . . . . 320<br />

Merging Revisions . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 322<br />

Merging Revisions Automatically . . . . . . . . . . . . . . . . . . . . . . . 322<br />

Working With <strong>MKS</strong> Visual Difference . . . . . . . . . . . . . . . . . . . 324<br />

Working With <strong>MKS</strong> Visual Merge . . . . . . . . . . . . . . . . . . . . . . . 330<br />

Merging in the Command Line Interface . . . . . . . . . . . . . . . . . 335<br />

Resolving Merges . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 336<br />

11 The Integrity Manager Integration . . . . . . . . . . . . . . . . . . 339<br />

Integrating With Integrity Manager . . . . . . . . . . . . . . . . . . . . . . . . . . 340<br />

How the Integration Works . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 340<br />

Creating a Change Package for an Issue . . . . . . . . . . . . . . . . . . . . . . 343<br />

Adding Entries to an Issue’s Change Package . . . . . . . . . . . . . . . . . 345<br />

Viewing a Change Package’s Issue . . . . . . . . . . . . . . . . . . . . . . . . . . 346<br />

Finding Change Packages Using a Query . . . . . . . . . . . . . . . . . . . . . 347<br />

v

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

Saved successfully!

Ooh no, something went wrong!