summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-11-24 09:56:21 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-11-24 10:11:31 +0000
commit42ee3299e0ba118467cdbe891b2c7abe7fbea719 (patch)
tree5ed20c30154bcd5e434bebf6dc91456a73d1798a /doc
parent89ce80037cb05fbc9f913bdf00eb16a73efefba9 (diff)
downloadqt-creator-42ee3299e0ba118467cdbe891b2c7abe7fbea719.tar.gz
Doc: Describe ClearCase options
Turn the table into text and describe the options next to the related functions. Change-Id: Ibae2ed2e63c68769f1a9edde865d124f4a65cbcc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/vcs/creator-vcs-clearcase.qdoc79
1 files changed, 49 insertions, 30 deletions
diff --git a/doc/src/vcs/creator-vcs-clearcase.qdoc b/doc/src/vcs/creator-vcs-clearcase.qdoc
index 5a155c5ba3..000f94b434 100644
--- a/doc/src/vcs/creator-vcs-clearcase.qdoc
+++ b/doc/src/vcs/creator-vcs-clearcase.qdoc
@@ -63,34 +63,53 @@
\endlist
- \section1 Using Additional ClearCase Functions
-
- The \uicontrol ClearCase submenu contains the following additional items:
-
- \table
- \header
- \li Menu Item
- \li Description
- \row
- \li \uicontrol{Check In}
- \li Create a permanent new version of the current file or all files
- in the versioned object base (VOB).
- \row
- \li \uicontrol{Check In Activity}
- \li Check in checked-out versions in the change set of the current
- Unified Change Management (UCM) activity.
- \row
- \li \uicontrol{Check Out}
- \li Create a writable copy of a branch. If you check out files in a
- UCM view, they are added to the change set of the UCM activity.
- \row
- \li \uicontrol{Undo Check Out}
- \li Cancel the checkout for a file and delete the checked-out
- version.
- \row
- \li \uicontrol{Undo Hijack}
- \li Resolve hijacked files. If you change the read-only attribute of
- a file that is loaded into a snapshot view and modify the file
- without checking it out, you \e hijack the file.
- \endtable
+ \section1 Checking out and Checking in
+
+ In addition to the standard version control system functions described in
+ \l {Using Common Functions}, you can check out and check in files.
+
+ To create a writable copy of a file, select \uicontrol Tools >
+ \uicontrol ClearCase > \uicontrol {Check Out}. If you check out files in a
+ Unified Change Management (UCM) view, they are added to the change set of
+ a UCM activity. By default, the activities are automatically assigned names.
+ To disable this functionality, select \uicontrol Tools > \uicontrol Options
+ > \uicontrol {Version Control} > \uicontrol ClearCase, and then deselect the
+ \uicontrol {Automatically assign activity names} check box.
+
+ To automatically check out files when you edit them, select \uicontrol Tools
+ > \uicontrol Options > \uicontrol {Version Control} > \uicontrol ClearCase,
+ and then select the \uicontrol {Automatically check out files on edit}
+ check box.
+
+ To cancel the checkout for a file and delete the checked-out version,
+ select \uicontrol Tools > \uicontrol ClearCase >
+ \uicontrol {Undo Check Out}.
+
+ To check in checked-out versions of files in the change set of the current
+ UCM activity, select \uicontrol Tools > \uicontrol ClearCase >
+ \uicontrol {Check In Activity}.
+
+ To create a permanent new version of the current file or all files in the
+ versioned object base (VOB), select \uicontrol Tools >
+ \uicontrol {ClearCase} > \uicontrol {Check In}. To be asked to confirm
+ that you want to check in the files, select \uicontrol Tools >
+ \uicontrol Options > \uicontrol {Version Control} > \uicontrol ClearCase,
+ and then select the \uicontrol {Prompt on check-in} check box.
+
+ By default, you are asked to enter a comment when checking files out or in.
+ To suppress this prompt, select \uicontrol Tools > \uicontrol Options >
+ \uicontrol {Version Control} > \uicontrol ClearCase, and then select the
+ \uicontrol {Do not prompt for comment during checkout or check-in} check
+ box.
+
+ If you change the read-only attribute of a file that is loaded into a
+ snapshot view and modify the file without checking it out, you \e hijack the
+ file. To revert a hijacked file to its checked in version, select
+ \uicontrol Tools > \uicontrol ClearCase > \uicontrol {Undo Hijack}.
+
+ By default, the files in the VOBs are indexed for quick access to their
+ statuses. To disable indexing, select \uicontrol Tools > \uicontrol Options
+ > \uicontrol {Version Control} > \uicontrol ClearCase, and then select the
+ \uicontrol {Disable indexer} check box. To only have some VOBs indexed,
+ specify them in the \uicontrol {Index only VOBs} field.
*/