Pending Changes preferences
Use the ClearCase® Pending Changes preferences dialog box to specify how changes in base ClearCase and in UCM should be handled.
Controls in the dialog box
The following controls are displayed in the Pending Changes dialog box.
Column name | Displays |
---|---|
Automatically checkin merges from the integration branch | Click to specify that checked out elements are to be automatically checked in to your development branch from your integration branch after a merge process in Base ClearCase. If this option is off, the checked out elements remain checked out from your development branch after a merge operation. |
Automatically checkin merges to the integration branch | Click to specify that checked out elements are to be automatically checked in to the integration branch after a merge process in Base ClearCase. If this option is off, the checked out elements remain checked out from the integration branch after a merge operation. |
When integrating checkouts, do a silent checkin | Click to specify that, when integrating checkouts in Base ClearCase through the Pending Changes view, checked out elements are to be checked in silently. If this option is off, the Checkin dialog box appears. |
When accepting, integrating, or synchronizing all changes, automatically continue to merge changes introduced following a directory merge | Click to allow automatic merges for incoming and outgoing changes in Base ClearCase after performing a directory merge procedure. |
During Synchronize, stop after the Rebase if there are incoming conflicts to allow building and testing | Click to specify that, when performing a Synchronize operation in the Pending Changes view in UCM, the Synchronize operation stops after rebasing (and before delivering) if there are conflicts so that you can build and test before delivering your changes. |
When showing activities incoming from the integration stream | Click to specify what types of activities from the integration stream in UCM appear in the Pending Changes view. You can select List integration activities only, List contributing activities only, or List both integration and contributing activities. Note that activities associated with development are contributing activities while activities that are automatically generated by the process of rebasing or delivering are integration activities. |
Restore Defaults | Click to restore the default settings to the Pending Changes preferences page. |
Apply | Click to apply any changes you have specified while leaving the Preferences dialog box open. |
OK | Confirms the operation and closes the Preferences dialog box. |
Cancel | Cancels the operation. |