02.05.2013 Views

Description - Mks.com

Description - Mks.com

Description - Mks.com

SHOW MORE
SHOW LESS

You also want an ePaper? Increase the reach of your titles

YUMPU automatically turns print PDFs into web optimized ePapers that Google loves.

your sandbox.<br />

While the Resync CP option searches all files related to a selected change package, and all the<br />

change packages that may be associated with the related files, the Resync By CP option only<br />

processes the change packages associated with the member you are resynchronizing.<br />

How Does the Resync By CP Option Work?<br />

The functioning of Resync by CP is affected by the options you choose for si resynccp. For<br />

more information, see si resynccp.<br />

When Should I Use the Resync By CP Option?<br />

Developers should use Resync By CP when they want to ensure that they have all dependent<br />

changes associated with a member revision, even if these changes are contained in other files. For<br />

example, a developer needs to check out (locked) a file and modify it. The developer finds that<br />

other revisions have been checked in since the member was resynchronized in the sandbox.<br />

Because the sandbox is quite large and contains many unrelated changes, the developer does not<br />

want to perform a standard resynchronization. The Resync By CP option can be used in this<br />

situation.<br />

Options<br />

This <strong>com</strong>mand takes the universal options available to all si <strong>com</strong>mands, as well as some general<br />

options. See the options reference page for descriptions.<br />

Note:<br />

If the working file of the member you are resyncing has been modified, Source Integrity asks<br />

you to confirm that you want to merge your modifications into the working file.<br />

--mergeType=[confirm|cancel|automatic|manual]<br />

specifies how you want to merge changes from the working file in your sandbox into the<br />

member revision.<br />

--mergeType=confirm prompts you to confirm a merge type.<br />

--mergeType=cancel cancels the selected merge type.<br />

--mergeType=automatic <strong>com</strong>pletes the merge process without launching the MKS Visual<br />

Merge tool.<br />

Caution: While Source Integrity and MKS Visual Merge are capable of performing<br />

automatic merging, MKS cannot guarantee that the merged results are “correct”. MKS<br />

re<strong>com</strong>mends that you examine and test the merged results before checking them into the<br />

199 of 457

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

Saved successfully!

Ooh no, something went wrong!