Академический Документы
Профессиональный Документы
Культура Документы
0
Tables . . . . . . . . . . . . . . . . . . . . . . . . . . . . vii
Chapter 1. Prerequisites . . . . . . . . . . . . . . . . . . . . . 1
Supported WebSphere Studio Workbench products . . . . . . . . . . . . 1
What is the WebSphere Studio Workbench? . . . . . . . . . . . . . 1
Supported Workbench products and versions . . . . . . . . . . . . . 2
Workbench download sites . . . . . . . . . . . . . . . . . . . . 2
Supported CMVC server versions . . . . . . . . . . . . . . . . . . 2
Index . . . . . . . . . . . . . . . . . . . . . . . . . . . . 57
iv SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figures
1. CMVC Support Web site . . . . . . . . . . . . . . . . . . . . . . . . . . . . 2
2. Opening the Workbench Install/Update Perspective . . . . . . . . . . . . . . . . . . 3
3. Creating a new Site Bookmark . . . . . . . . . . . . . . . . . . . . . . . . . . 4
4. Settings for the SDWB 5.0 download site bookmark . . . . . . . . . . . . . . . . . . 4
5. SDWB Features Site Bookmark . . . . . . . . . . . . . . . . . . . . . . . . . . 5
6. Available SDWB features . . . . . . . . . . . . . . . . . . . . . . . . . . . . 5
7. Install information for CMVC Version Control Feature . . . . . . . . . . . . . . . . . . 6
8. Opening the Workbench Install/Update Perspective . . . . . . . . . . . . . . . . . . 7
9. Available SDWB features . . . . . . . . . . . . . . . . . . . . . . . . . . . . 7
10. Update information for CMVC Version Control Feature . . . . . . . . . . . . . . . . . 8
11. CMVC Support Web site . . . . . . . . . . . . . . . . . . . . . . . . . . . . 8
12. Workbench label decoration preference . . . . . . . . . . . . . . . . . . . . . . 10
13. CMVC preferences . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 11
14. CMVC label decoration preferences . . . . . . . . . . . . . . . . . . . . . . . . 14
15. Label decorations in the Navigator view . . . . . . . . . . . . . . . . . . . . . . 15
16. Associating a project with CMVC . . . . . . . . . . . . . . . . . . . . . . . . . 16
17. Share Project wizard: Repository type . . . . . . . . . . . . . . . . . . . . . . . 17
18. Share Project wizard: Enter or choose a CMVC family . . . . . . . . . . . . . . . . . 18
19. Share Project wizard: CMVC user ID . . . . . . . . . . . . . . . . . . . . . . . 19
20. Share Project wizard: Preference set . . . . . . . . . . . . . . . . . . . . . . . 20
21. Share project wizard: New preference set . . . . . . . . . . . . . . . . . . . . . . 20
22. Project Properties window . . . . . . . . . . . . . . . . . . . . . . . . . . . 22
23. Edit Preference window . . . . . . . . . . . . . . . . . . . . . . . . . . . . 23
24. Project Properties window showing modified preference set . . . . . . . . . . . . . . . 24
25. Project Properties window . . . . . . . . . . . . . . . . . . . . . . . . . . . 25
26. Delete Preference window . . . . . . . . . . . . . . . . . . . . . . . . . . . 25
27. Confirm window for removing shares . . . . . . . . . . . . . . . . . . . . . . . 26
28. Workbench Navigator view . . . . . . . . . . . . . . . . . . . . . . . . . . . 27
29. CMVC File Queries view . . . . . . . . . . . . . . . . . . . . . . . . . . . . 28
30. CMVC Repository Explorer . . . . . . . . . . . . . . . . . . . . . . . . . . . 28
31. Synchronize view. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 29
32. CMVC Files Query List view . . . . . . . . . . . . . . . . . . . . . . . . . . 30
33. Choose location icon . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 30
34. Query icon . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 32
35. Query window . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 32
36. Query icon . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 33
37. Query window . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 33
38. Choose Query Rows window . . . . . . . . . . . . . . . . . . . . . . . . . . 34
39. Refresh icon . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 34
40. Query icon . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 34
41. Query window . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 35
42. Save Query window . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 35
43. Synchronize view after selecting Team > Synchronize > With Latest . . . . . . . . . . . 42
44. Resolving a conflict in the Synchronize view . . . . . . . . . . . . . . . . . . . . . 43
45. Choose a Level for Synchronization window . . . . . . . . . . . . . . . . . . . . . 43
46. Synchronize view after selecting Team > Synchronize > With Level . . . . . . . . . . . 44
47. Resolving a conflict in the Synchronize view . . . . . . . . . . . . . . . . . . . . . 44
48. Selecting a workspace file . . . . . . . . . . . . . . . . . . . . . . . . . . . 48
49. Clicking Team > Lock . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 48
50. Suppress local path prefix mapping . . . . . . . . . . . . . . . . . . . . . . . . 49
51. Add prefix to CMVC path mapping . . . . . . . . . . . . . . . . . . . . . . . . 50
52. Selecting a workspace file . . . . . . . . . . . . . . . . . . . . . . . . . . . 51
53. Clicking Team > Lock . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 51
© Copyright IBM Corp. 2003 v
54. CMVC path starts with project name mapping . . . . . . . . . . . . . . . . . . . . 52
55. Suppress local path prefix mapping . . . . . . . . . . . . . . . . . . . . . . . . 52
56. Add prefix to CMVC path mapping . . . . . . . . . . . . . . . . . . . . . . . . 53
vi SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Tables
1. Download sites for WebSphere Studio products . . . . . . . . . . . . . . . . . . . . 2
2. Global CMVC preferences . . . . . . . . . . . . . . . . . . . . . . . . . . . 11
3. Label decorations: CMVC . . . . . . . . . . . . . . . . . . . . . . . . . . . 15
4. Examples of path mapping definitions . . . . . . . . . . . . . . . . . . . . . . . 21
5. File management quick task reference . . . . . . . . . . . . . . . . . . . . . . . 31
This guide describes how to install and use the CMVC Version Control Feature. It
assumes that you are familiar with basic CMVC concepts and tasks.
For CMVC conceptual and reference information, see the CMVC InfoCenter at
http://w3.sdwb.ibm.com/cmvc/5.0/infocenter/.
For information about CMVC change request management tasks that you can
perform in the Workbench, see the CMVC Change Request Management Feature
User Guide at http://w3.sdwb.ibm.com/cmvc/50documentation.html.
For more information about IBM and industry terminology, search the IBM
Terminology Database at http://ibmterm.torolab.ibm.com/.
This section provides overview information about the WebSphere Studio Workbench
and installation instructions:
v “What is the WebSphere Studio Workbench?”
v “Supported Workbench products and versions” on page 2
v “Workbench download sites” on page 2
In this CMVC Version Control Feature User Guide, WebSphere Studio Workbench
and Workbench refer to the WebSphere Studio products that are based on the
WSWB IDE and supported by the CMVC Version Control Feature.
Related information:
v For more information about WebSphere Studio Workbench, see the basic tutorial
in the Getting Started section of your Workbench product documentation. To
access your Workbench documentation, click Help > Help Contents.
v For more information about Eclipse and the open-source Eclipse Project, see the
Eclipse Web site at http://www.eclipse.org/.
https://ldbdcf1.southbury.ibm.com/software/support.nsf/site/sdwb+cmvc/
2. New Workbench users: See the Basic Tutorial in the Getting Started section
of your Workbench product documentation. To access Workbench
documentation, click Help > Help Contents.
2 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Chapter 2. Installing, updating, or removing the CMVC Version
Control Feature
Installing the CMVC Version Control Feature . . . . . . . . . . . . . . 3
Step 1. Open the Workbench Install/Update perspective . . . . . . . . . 3
Step 2. Create a site bookmark for the SDWB download site . . . . . . . 3
Step 3. Install the CMVC Version Control Feature . . . . . . . . . . . 5
Installing feature updates . . . . . . . . . . . . . . . . . . . . . 6
Step 1. Check for available feature updates . . . . . . . . . . . . . . 6
Step 2. If updates are available, open your Workbench Install/Update
perspective . . . . . . . . . . . . . . . . . . . . . . . . . 6
Step 3. Install updates for the CMVC Version Control Feature . . . . . . . 7
Removing features . . . . . . . . . . . . . . . . . . . . . . . . 8
4 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 5. SDWB Features Site Bookmark
2. Select the CMVC Version Control Feature. Information about the feature is
available in the Preview view.
6 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 8. Opening the Workbench Install/Update Perspective
3. In the Feature License window, review and accept the license agreement, then
click Next.
4. In the Install Location window, click Finish.
5. In the Feature Verification window, click Install to complete the installation.
6. When prompted to restart the Workbench:
v Click No if you are adding or updating other features.
v Click Yes if you have completed all feature installs and updates.
Removing features
The Workbench allows you to disable features. However, disabling a feature does
not remove the feature from your file system.
The Workbench does not provide a feature uninstall option. Features must be
removed from the file system manually. If you need to remove a Workbench feature,
see the Support Technote on this topic. You can access this Technote on the CMVC
Support Web site.
https://ldbdcf1.southbury.ibm.com/software/support.nsf/site/sdwb+cmvc/
8 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Chapter 3. Getting started
To use the CMVC Version Control Feature:
1. Install a supported WebSphere Studio Workbench product. For more
information, see Chapter 1, “Prerequisites,” on page 1.
2. Install the CMVC Version Control Feature using your Workbench Install/Update
Manager. For more information, see “Installing the CMVC Version Control
Feature” on page 3.
3. Set global preferences for your Workbench and the CMVC Version Control
Feature. For more information, see “Setting global preferences.”
4. Create Workbench projects for the CMVC Version Control Feature. For more
information, see “Setting up and managing projects” on page 15.
5. Familiarize yourself with the views associated with the CMVC Version Control
Feature. For more information, see “Using Workbench views to perform CMVC
Version Control Feature tasks” on page 26.
6. Associate the CMVC views with a CMVC location. For more information, see
“Associating the CMVC views with a CMVC location” on page 30.
7. Refer to the examples as needed to perform CMVC tasks. For more
information, see “Examples” on page 30.
CMVC preferences
To set global CMVC preferences:
1. Click Window > Preferences.
2. In the Preferences window, expand the Team entry, then click CMVC.
10 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 13. CMVC preferences
After you turn on this option, you have two choices for the
format in which back up file names are assigned:
v ″x.txt″ becomes ″.x.txt″
v ″x.txt″ becomes ″x.$txt″
Show success messages CMVC issues a message after every successful action. On
12 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Table 2. Global CMVC preferences (continued)
Option Description Default
Prefill last-entered defect/feature The last defect or feature name you entered will not be Off
name prefilled in any windows during CMVC actions.
The following is a summary of the CMVC label decorations and their descriptions:
14 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Table 3. Label decorations: CMVC
Label decoration Example Description
Lock decoration This decoration has two variations: the key icon
signifies that you have locked the file in CMVC; the
padlock icon signifies that someone else has locked
the file in CMVC. This decoration appears on the file
icon.
Version decoration [1.1] Shows the version number of the file in CMVC next to
the corresponding file in your workspace; this
decoration appears after the file name.
Change decoration *> Signifies that you have changed the workspace file but
have not checked the file into CMVC; this decoration
appears before the file name.
Create decoration ** Signifies that the file is present in your workspace but
does not exist in CMVC; this decoration appears before
the file name.
The following is the Navigator view showing resources with CMVC label
decorations:
3. In the Share Project wizard, click CMVC as your repository type, then click
Next.
16 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 17. Share Project wizard: Repository type
4. Enter the fully qualified name of your CMVC family in the format
familyname@host@port, then click Next.
Note: You can click Test Connection to ensure that you have a working
connection to your CMVC family
Note: The first time you associate a project with a CMVC location, you must
manually enter the name of your CMVC family. When you use the wizard
again, the family names you have previously entered are saved and
available as entries in the drop-down list.
5. Type your CMVC user ID, then click Next. If you use password authentication,
you will be asked to type your password the first time you perform a CMVC
action.
Note: Although the CMVC Version Control Feature supports both host and
password authentication, password authentication is recommended
because it is more secure and flexible than host authentication.
18 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 19. Share Project wizard: CMVC user ID
6. You must create a new preference set for your project or select an existing
preference set. Click New to create a new preference set.
7. In the New Preference Set window, type the required and optional information
for the preference set, then click OK.
20 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
v Indicate whether you are working in concurrent development mode (this
corresponds to the CMVC_CONC_MODE environment variable in traditional
CMVC clients).
v Define default mappings between the path names of files in your local
workspace and the path names of files stored in CMVC.
Note: Workspace paths are defined from the workspace root. That is, they
begin with the project name, followed by the full path from the project
root.
8. Click Finish to exit the wizard. If you are using password authentication, the
CMVC Version Control Feature will prompt you to type your password the first
time you perform a CMVC action.
Related information:
v “Changing CMVC project associations” on page 26
v “Removing CMVC project associations” on page 26
3. In the Edit Preference window, edit the fields you want to change.
Note: The Affected Projects field lists the projects associated with the
preference set you are modifying. Changes you make to the preference
set apply to all of these projects.
22 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 23. Edit Preference window
4. Click OK. The new values for the preference set are shown in the Project
Properties window.
Deleting a preference set: You can delete preference sets you have created that
are no longer associated with any of your workspace projects.
Note: You cannot delete a preference set that is still associated with a project. You
must first associated the project with a different preference set and then
delete the old preference set.
24 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 25. Project Properties window
3. In the Delete Preference window, select the preference set you want to delete.
Note: The Affected Projects field lists the projects associated with the
preference set you are deleting. You cannot delete preference sets that
are being used by the current project or any other workspace project.
4. Click OK.
Note: Removing a CMVC project association does not change the state of any
files either in your local workspace or in CMVC. However, label
decorations are shown only for projects that are shared with CMVC.
Removing a CMVC share will cause all new and changed file decorations
in the workspace to disappear. Be sure that all checked out and locked
files are checked back into CMVC before removing the project
association.
For a list of tasks you can perform from each view, see the “File management task
reference” on page 31.
26 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
v Click OK to show the view in your workspace.
The Team menu allows you to perform actions and interactions on the files in your
workspace and the files in CMVC. For a complete list of tasks you can perform from
any workspace navigation view, see the “File management task reference” on page
31.
For a complete list of tasks you can perform from the CMVC File Queries view, see
the “File management task reference” on page 31
For a complete list of tasks you can perform from the CMVC Repository Explorer,
see the “File management task reference” on page 31.
Synchronize view
The Synchronize view gives you several options for synchronizing the files in your
local workspace with files in CMVC. If there are conflicts between the two sets of
files, the Synchronize function compares the version number associated with the file
in your workspace to the version number in CMVC. The Synchronize view uses
three different modes, which you can switch among by choosing the appropriate
mode on the title bar of the Synchronize view:
Mode Description
Incoming mode Only resources that have been created or
changed in CMVC since you last
synchronized your workspace files with the
files in CMVC are visible
28 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Mode Description
Outgoing mode Only resources that have been created,
changed, or deleted in the workspace since
you last synchronized your workspace files
with the files in CMVC are visible
Incoming/outgoing mode Both incoming and outgoing changes are
visible
The different synchronization modes not only filter the files that you can view, but
the modes also restrict the set of CMVC actions you can perform on those files.
See “Synchronizing workspace files with CMVC files” on page 41 and the
Appendix B, “Synchronization Example,” on page 55 for more information.
The Synchronize view allows you to quickly see the state of files by using label
decorations. See the CMVC label decoration preferences section of “Setting global
preferences” on page 9 for a summary and description of the CMVC label
decorations.
For a complete list of tasks you can perform from the CMVC Synchronize view, see
the “File management task reference” on page 31.
For a complete list of tasks you can perform from the CMVC Query List view, see
the “File management task reference” on page 31.
2. If you have not previously associated the view with any CMVC location, click
Create a New Location, then follow the instructions in the wizard.
Note: If you are using both the CMVC Version Control Feature and the CMVC
Change Request Management Feature, enter your CMVC location
information exactly the same way in both places. For example, if you
specify the host name for the family in one feature, specify the host
name, not an alias, in the other feature. This enables the features to
share your CMVC ID and password information so that you only have to
log in once.
If you have chosen a CMVC location before, select the location in the field
under Use Existing Location, then click OK. Type your password if your
CMVC family uses password authentication.
Examples
v Appendix A, “Path Mapping Examples,” on page 47
v Appendix B, “Synchronization Example,” on page 55
30 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Chapter 4. File management tasks
File management task reference
Table 5 summarizes CMVC file management tasks and indicates where in the
Workbench you can perform them. For more information on these views and how to
show them in your workspace, see “Using Workbench views to perform CMVC
Version Control Feature tasks” on page 26.
Table 5. File management quick task reference
Task Any CMVC File CMVC CMVC CMVC Files
workspace Queries view Repository Synchronize view Query List view
navigation Explorer
view
Changing a CMVC share X
Checking in files X X X
Checking out files X X X
Choosing a CMVC X X
location
Comparing files X X
Creating files X X
Deleting files X X X
Destroying files X X
Extracting files X X X X
v Extracting files to a
new project
v Extracting a level
Locking files X X X
Merging files
Queries: X X
v Creating a query
v Customizing a query
v Editing a query
v Running a query
v Refreshing a query
v Saving a query
Recreating files X X
Removing a CMVC share X
Renaming files X X
Synchronizing file X X
contents
v Synchronizing with
latest
v Synchronizing with
level
Synchronizing lock X X
decorators
Undoing file changes X
2. In the Query window, type the required and optional information, such as
release and component, to define which files you would like listed in the CMVC
File Queries view.
3. Click OK. The CMVC Version Control Feature lists the files in the CMVC File
Queries view.
32 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Initially the files are sorted alphabetically by path name. To resort the list, click the
heading of any of the columns. Clicking on the same heading more than once sorts
the column first in ascending order, then in descending order.
3. In the Choose Query Rows window, select the fields you want to query against
and deselect the fields you do not wish to query against.
2. In the Query window, type the object and type the required and optional
information to define which files you want listed in the CMVC File Queries view.
34 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 41. Query window
3. Before you click OK in the Query window to run the query, click Save Query to
save this query in the CMVC Files Query List view.
Note: By default, the query will be saved in the Query List folder. Click Create
New Folder to create a new folder where the query will be saved.
5. Click OK to close the Save Query window.
6. Back in the Query window, click OK. The CMVC Version Control Feature runs
the query, displays the results in the CMVC File Queries view, and saves the
query to in the CMVC Files Query List view.
Note: The CMVC Version Control Feature does not require you to confirm the
delete action for saved queries. If you accidentally delete a saved query,
you can undo the operation by right-clicking anywhere in the CMVC Files
Query List view, then clicking Undo Remove.
File actions
Note: If you have the Prefill defect/feature name on checkin preference turned
on, this field will already contain the defect or feature name used to
check out the file. See “Setting global preferences” on page 9 for more
information about this and other preferences that affect CMVC file
management actions.
4. Click OK. The key icon is no longer next to the file in your workspace. This
indicates that you checked the file in successfully. The file is now unlocked, and
the most recent version is stored in CMVC.
36 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
To check a file out of CMVC:
1. Select the file you want to check out.
2. Right-click, then click Check Out.
3. In the Check Out Files window, type the required and optional information, such
as a defect name.
4. Click OK. A key icon appears next to the file in your workspace, indicating that
you have checked out the file successfully. The file is now locked in CMVC, and
a copy of the most recent version is in the workspace project you specified.
Comparing files
You can view the differences between two files by comparing them. You can
compare the version of a file in your workspace to the most recent version of the
file in CMVC, compare the version of a file in your workspace to any version of the
file in CMVC, or you can compare two CMVC versions of a file. If the two files are
the same, you will get a message that there are no differences between the
selected files. If there are differences in the files, you can merge the differences
together. See “Merging files” on page 39 for more information about merging files.
Also, see your Workbench product documentation for more information about the
Compare editor and its associated preferences.
After you are done reviewing the differences between the files, you can merge the
files together if you would like. See “Merging files” on page 39 for details on this
function.
After you are done reviewing the differences between the files, you can merge the
files together if you would like. See “Merging files” on page 39 for details on this
function.
To delete files:
1. Select the file you want to delete.
2. Right-click, then click Delete.
3. In the Delete window, type the required and optional information, such as defect
name.
4. Click OK to delete the file.
38 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
4. Click OK. The file is copied to your workspace in the project you specified.
Note: A padlock icon next to a file indicates that someone else has locked the file.
Merging files
The CMVC Version Control Feature allows you to merge files in your workspace
with their counterparts stored in CMVC using the Eclipse compare/merge editors.
See your Workbench product documentation for more information about the basic
merge function provided in Eclipse. You can merge a file in your workspace with the
most recent version of that file in CMVC or merge a file in your workspace with any
version of that file in CMVC. The merge function is most commonly used in
conjunction with the compare function; after you compare two files, you can merge
together the differences, if there are any. See “Comparing files” on page 37 for
more information about comparing files.
Replacing files
You can replace files in your workspace with files stored in CMVC. You can either
replace the files in your workspace with the most recent version of the
corresponding files in CMVC, or you can replace the files in your workspace with
any version of the files in CMVC that you choose. The CMVC Version Control
Feature uses the release and path mappings specified in the preference set of your
project to determine which files to extract from CMVC. Therefore, you must have
your path mappings set correctly to use the replacing files function. See
Appendix A, “Path Mapping Examples,” on page 47 for more detail about path
mappings. If no versions of a file exist in CMVC you will receive a message saying
the file was not found in CMVC.
Note: If you are currently editing the file in your workspace when you attempt
to replace the file with the most current version in CMVC, the CMVC
Version Control Feature will ask you if you would like to replace the file.
Otherwise, the workspace file will be replaced with no prompting.
40 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Note: You can compare your workspace file with particular version of the file in
CMVC from the Replace editor. To do this:
a. Select the version of the CMVC file you want to compare with your
workspace file.
b. Right-click, then click Compare. The two files open in the Compare
editor. See Comparing Files for more information about comparing
workspace files with files stored in CMVC.
4. Right-click, then click Replace. The CMVC Version Control Feature extracts the
version of the file you specified from CMVC to your workspace.
Mode Description
Incoming mode Only resources that have been created or
changed in CMVC since you last
synchronized your workspace files with the
files in CMVC are visible
Outgoing mode Only resources that have been created,
changed, or deleted in the workspace since
you last synchronized your workspace files
with the files in CMVC are visible
Incoming/outgoing mode Both incoming and outgoing changes are
visible
The different synchronization modes not only filter the files that you can view, but
the modes also restrict the set of CMVC actions you can perform on those files.
The following table summarizes which actions are available in the different modes
given three common scenarios when synchronizing workspace files with the most
recent files in CMVC:
Note: The Synchronize with Level function only uses the incoming mode; because
you are synchronizing with committed CMVC levels, you can only make
Figure 43. Synchronize view after selecting Team > Synchronize > With Latest
Note: If the contents of your workspace are the same as the contents of
CMVC, nothing will appear in the Synchronize view, and you will get a
message saying the files are the same in both places.
3. In the Synchronize view, right-click the file you want to resolve, then select the
appropriate action to make the workspace file consistent with the file in CMVC.
You can also double-click the file to open the Compare editor, which allows you
to compare and merge together the contents of your workspace file with the
latest version in CMVC. See “Comparing files” on page 37 for more information
about comparing files.
42 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 44. Resolving a conflict in the Synchronize view
4. Click the level you want to synchronize with, then click OK. The CMVC Version
Control Feature compares the files in your workspace with the files in CMVC
and produces a list of conflicts in the Synchronize view. By default, the
Synchronize view is set to incoming mode; the outgoing and incoming/outgoing
Figure 46. Synchronize view after selecting Team > Synchronize > With Level
Note: If the contents of your workspace are the same as the contents of
CMVC, nothing will appear in the Synchronize view, and you will get a
message saying the files are the same in both places.
5. In the Synchronize view, right-click the file you want to resolve, then select the
appropriate action to make the workspace file consistent with the file in CMVC.
You can also double-click the file to open the Compare editor, which allows you
to compare the contents of your workspace file with the latest version in CMVC.
See “Comparing files” on page 37 for more information about comparing files.
To synchronize the lock decorators in your workspace with the state of files in
CMVC:
44 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
1. Select the project or files you want to synchronize.
2. Right-click, then click Team > Sync Lock from the context menu. The CMVC
Version Control Feature compares the files in your workspace with the files in
CMVC and changes the lock decorators in your workspace as needed.
Note: If the state of the files in your workspace are the same as the state of
the files in CMVC, no decorators will change in your workspace.
You set up path mappings when you create a project. The options for changing the
path of your workspace files to match the path of the files in CMVC include:
Option Description
CMVC path starts with project name By default, this setting is enabled. Turn this
option off if you do not want the path of the
file in CMVC to begin with the workspace
project name.
Suppress local path prefix The text you enter in this field will be
removed from the beginning of the path of
files in your workspace when mapping to
CMVC.
Add prefix to CMVC path The text you enter in this field will be added
to the beginning of the path of files in your
workspace when mapping to CMVC.
This section includes the following examples of how to alter your path mappings to
get a correct association between the files in your workspace and the files in
CMVC:
v “Mapping workspace path names to CMVC file names: CMVC path name starts
with workspace project name” on page 48
v “Mapping workspace path names to CMVC file names: CMVC path name does
not start with workspace project name” on page 50
Note: The CMVC Version Control Feature assumes that you are mapping from
your workspace files to the files in CMVC.
To successfully lock the file, the developer must alter the path mappings to
associate the two files. The developer follows these steps:
1. The developer selects the file, abc.txt, in the workspace.
3. In the Lock window, the developer types the following information to correctly
set up the path mappings:
48 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Note: The window shows you the resulting path dynamically as you type in the
fields and gives you a warning message in red if the file paths do not
match.
CMVC path starts with project name
Because both file paths begin with the project name, Project, the
developer leaves this option selected.
Suppress local path prefix
The file in CMVC does not contain an ″s″ in the path, so the developer
types ″s″ in this field to suppress the character resulting in the
workspace path: Project/rc/abc1.txt.
4. The developer types in the other required and optional information, then clicks
OK. A key icon appears next to the file in the developer’s workspace, indicating
that the developer has successfully locked the file.
To successfully lock the file, the developer must alter the path mappings to
associate the two files. The developer follows these steps:
1. The developer selects the file, abc.txt, in the workspace.
50 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
Figure 52. Selecting a workspace file
3. In the Lock window, the developer types the following information to correctly
set up the path mappings:
Note: The window shows you the resulting path dynamically as you type in the
fields and gives you a warning message in red if the file paths do not
match.
CMVC path starts with project name
Because the path of the CMVC file does not begin with the workspace
project name, Check, the developer leaves deselects this option,
resulting in the path ssrc/abc.txt.
52 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide
the path. The developer types ″Project″ in this field to add this to the
path, resulting in the workspace path Project/src/abc.txt.
4. The developer types in the other required and optional information, then clicks
OK. A key icon appears next to the file in the developer’s workspace, indicating
that the developer has successfully locked the file.
I
IBM Terminology Database ix U
Install/Update Manager 3, 6 updates to this guide ix
installing the CMVC Version Control Feature updating the CMVC Version Control Feature
instructions 3 instructions 6
URL for Install/Update Manager site bookmark 3 URL for Install/Update Manager site bookmark 6
using the Workbench Install/Update Manager 3 using the Workbench Install/Update Manager 6
W
WebSphere Studio Workbench
documentation 1
58 SDWB 5.0: CMVC Version Control Feature for WebSphere Studio User Guide