Set the Tip Conflict options when you want to determine what action Dimensions CM takes when you check in items that have conflicting item revisions.
PRIVILEGES No special privileges required.
To access the Tip Conflict settings:
Select Tools | Preferences and select the Tip Conflict Options tab.
To determine whether Dimensions CM checks for conflicting revisions when you check in or update items:
Select Check for tip conflicts when checking-in or updating items if you want Dimensions CM to perform a check for branch conflicts when you attempt to check in or update an item.
NOTE If the parameter DM_DISABLE_BRANCH_CHECKINS has been set in the dm.cfg file, this option will be selected and you will not be able to change it. For details of how to set this parameter, see the System Administration Guide.
To determine what action Dimensions CM takes when it detects that you are checking in or updating items that have conflicting revisions:
Select Merge conflicts with my changes and check-in/update the item now to invoke the PVCS Merge Tool. The files will be merged to a temporary file and the temporary file will be used for the check in.
Select Update my local workfile content after merging to have the files in your work area overwritten with the resulting temporary merged file after completing the merge. If this option is not set, the files in your work area will remain as they were before the check in/update, and the temporary file will be discarded once the check in is complete.
Select Merge conflicts with my workfiles, I’ll check-in/update the item later to invoke the default merge tool and have the merged file overwrite the file in your work area, but not be checked in to the repository, enabling you to carry on working with this merged file.
If you attempt to check in or update the file later, the local metatada will have recorded that a merge was performed. Dimensions CM will check whether there have been any subsequent changes in the repository, and if not, and check in or update the merged file (without invoking the default merge tool). If there have been changes in the repository, the Serena Merge Tool will be invoked.
Select Do not perform an interactive merge but check-in/update my changes as the tip to check in the version of the file in your work area as the tip revision without invoking the default merge tool.
Select Ignore the conflict and continue with the check-in/update to check in the version of the file in your work area as a branch revision without invoking the default merge tool.
NOTE This option does not appear if your administrator has set the symbol DM_DISABLE_BRANCH_CHECKINS in the dm.cfg file. For details, see the System Administration Guide.
To determine the behavior of the merge tool when it is invoked:
Select Perform merge silently if you do not want the merge tool to be displayed when there are no conflicting lines in the files being merged.
Select Keep backups made of my workfile(s) prior to merging if you want a backup of your workfile to be created when the content of the workfile has been overwritten as a result of the merge process.
The backup copy will have the original file name appended with the string ".premerge_<date_time>, for example the backup for bonus_spec.doc might be bonus_spec.doc.premerge_2007081611_115203.
These backup copies are created in your temporary file location and will remain on disk until you delete them.
To determine whether the Tip Conflicts dialog box is displayed:
Select On check-in/update, assume the settings above and do not show the warning dialog if you do not want the Tip Conflicts dialog box to be displayed when a conflict is detected.
If this option is not set, the Tip Conflicts dialog box will be displayed when a tip conflict is detected, enabling you at that point to change the options listed under If conflicts are detected, default to:.
Related Topics
Personal Library Cache Directory (PLCD) provides faster access to repository files by removing network transfers when the same revision has been previously fetched to a work station. PLCD makes a local copy in a cache directory of items downloaded from, and uploaded to, Dimensions CM. This speeds up transfers when fetching the same revision more than once, for example, fetching a baseline or a patch, or overwriting unwanted changes by restoring revisions.
PRIVILEGES No special privileges required.
To access the PLCD settings:
Select Tools | Preferences and select the Personal Library Cache tab.
Select Enable Personal Library Cache to activate PLCD. Default: on
In the Cache directory path box specify the location of the cache directory on your local machine.
Maximum cache size specifies the size of the PLCD directory. When this directory reaches this size, earlier revisions of items are deleted to make more space.