At this point in the delivery, when all versions are merged, the deliver operation is still in progress. The destination versions (the new versions resulting from the merges) are checked out and visible only in your integration view.
Your integration view shows your delivered work and the work that other team members have delivered. To make sure that your work is compatible with other delivered work, we recommend that you test the work in your integration view before you complete the deliver operation.
For information on accessing your integration view, see Accessing a Dynamic View or Accessing a Snapshot View.
Your organization can use clearmake as ClearCase build tools; however, the build auditing and build avoidance features are available only from dynamic views. For more information about clearmake, see Building Software and the reference page in the Command Reference.
In addition to building and testing, you may need to do the following:
Edit the versions checked out to your integration view to resolve build errors
Check out and edit additional elements to resolve build errors
Update your integration view
Undo a deliver operation
In the process of building and testing, you may need to check out versions in your integration view and modify them to resolve build errors. As described in Under the Hood: Integration Activities and Baselines, ClearCase adds any modifications you make during the deliver operation to an integration activity.
NOTE: We recommend that you postpone checking in your modifications until you complete the delivery. Checking in complicates efforts to undo the deliver operation, if you find it necessary to do so.
If you and other project members perform concurrent deliveries and if your integration view is a snapshot view, the view becomes out of date when other team members deliver to the target stream. If you try to check out a version that is not the latest in the target stream, ClearCase prompts you to check out the latest version in the target stream and then loads it into your view.
At any time before you complete the deliver operation, you can undo changes made as a result of the deliver operation. This undo procedure is valid only if you have started a deliver operation, have not checked in modifications in the target view, and have not completed the deliver operation.
If you started Diff Merge, close it.
If the Deliver Progress dialog box is open, click Cancel.
From your development view, type the following command:
ClearCase cancels all checkouts in the integration view and removes all merge arrows created during the current deliver operation. (ClearCase uses merge arrows in VOBs to keep a history of merges.)
If you checked in any versions to the integration view, using the -cancel option is not sufficient to undo the deliver operation. You must either complete the operation (recommended) or use cleartool rmver -hlink to remove the versions you checked in before canceling the operation. Because rmver erases part of your organization's development history, your organization may not allow individual developers to use it. Because it may have unintended consequences, be very conservative in using this command, especially with the -hlink option. For more information, see the rmver reference page in the Command Reference.
|
Feedback on the documentation in this site? We welcome any comments!
Copyright © 2001 by Rational Software Corporation. All rights reserved. |