 | Review your tasks
Now you can use Rational ClearQuest directly from within the ClearCase Remote
Client to review the tasks that you need to complete. In this section you will
learn how to do these two tasks:
- Join a Unified Change Management (UCM) project
- Deliver an activity to an integration stream
The Rational ClearCase and ClearQuest change management products work together
to enable you to define and manage changes to software assets as activities.
Through the UCM capability, file versions in ClearCase are associated with activities
in ClearQuest. You can then perform operations directly on the activities rather
than on the collections of files associated with them. This activity-based approach
to change and configuration management helps you focus on what's important:
working on the right versions of the right files. It enables you to create collections
of file versions, or change sets, for each change. That way, you work
at the task level rather than managing individual files. This also helps build
engineers ascertain that the right files are incorporated into the build. Plus,
testers can easily confirm that the right functionality and builds are tested,
quality assurance (QA) engineers can quickly see and validate what has changed
between builds, and project managers back in the States can more easily track
and assess project status.
- Click the Join a UCM Project button on the toolbar.
Figure 8. Joining the UCM project
- In the Join a UCM Project window, expand the Web server, then the
ClearCase menu, then the Project VOBs, then CLSICS_pvob.
Select the UCM Project CLSICS_CD and click Next.
Figure 9. Selecting a project
- In the "Set up a ClearCase UCM Development Environment" step
of the wizard, select the check box to Create a new development stream.
Under Stream name, enter
alex_task_stream and then click Next.
- Be sure that the check box for "Create a Development View" is
selected. You can keep the default name for the view.
Figure 10. Creating a new project stream
- In the "Create a ClearCase UCM integration view" step, select
the check box to Create a ClearCase integration view.
- Under "Copy area path name," enter this path:
C:\Documents and Settings\Administrator\alex_CLSICS_CD_int
- Click Finish.
- When the wizard completes you will be prompted to use the Edit Configuration
tool to load the views.
Figure 11. Loading the views
- In the "Edit Configuration" dialog box, click the check
box to Show private VOBs.
- Expand the plus sign next to VOBs, and then select the root of the
CLSICS_comp VOB, click Add and click OK.
After choosing your view's configuration, you must select which assets
you want to work on. When you have done that, your local workspace becomes populated
with those files and directories.
Now you need to find the activity that you are going to be working on:
- In ClearCase Navigator, expand the My Views section, and then
expand the alex_task_stream view.
- Select My Activities under the newly created Task view.
Figure 12. Activities associated with the view
Work on "My Activities"
- Select the activity Fix spelling error in Readme.html, right-click,
and click Work on.
Figure 13. Selecting an activity to work on
- To verify the defects that you will be working on, navigate to the Readme.html
file (in the ClearCase Navigator pane) by selecting CLSICS_comp >
MyHomePage > WebContent.
- Right-click the file Readme.html file and click Open.
- You should see the file displayed at the bottom of the ClearCase Remote Client window.
- Verify the two spelling errors in the headline and then close the browser
window.
- Next, open the index.html file in the same way. The headline says
"The Ultimate A Company" but should say "The Ultimate B Company.”
Edit the Readme.html and index.html files
First, you need to check out the files to hold reserve copies in your view
before you can make changes. This ensures that no one else on the team makes
changes to a version while you hold it reserved.
- Right-click on Readme.html and select Check out.
- Click Show Details on the dialog that opens to verify that the defect
that you are working on is CLSIC00000058.
- Click OK to complete the checkout.
- Repeat this step for the index.html file.
Figure 14. Check out the files
- In the ClearCase Details pane, navigate to the Readme.html file
(in the WebContent directory under MyHomePage).
- Right click and select Open With, then Text Editor.
Figure 15. Editing the files
- Find the line that starts with
<h2 (a second-level html header tag). From there, you can see the spelling
errors that need to be corrected.
- Correct the spelling errors by removing the extra letter d in "Readme"
and the letter i from "Home."
- Save the changes by closing the editor window and clicking Yes when
you see the Save prompt.
- Back in the ClearCase Details pane, navigate to the index.html file
(also in the WebContent directory under MyHomePage).
- Right-click and select Open With, then Text Editor.
- Change the headline from "The Ultimate A Company" to "The
Ultimate B Company" on the line that starts with
<title>.
- Save the changes by closing the editor window and clicking Yes in
response to the Save prompt.
Now you need to check in your changes. The ClearCase Remote Client in Version 7.1
includes a feature that allows developers to check in multiple files at once.
- Right-click on the WebContent folder, and select Aggregated
and then Check In.
- Accept all defaults in the "Checkin" dialog box and click OK.
Figure 16. Checking the files back in
Now the file is checked into the VOB.
Deliver the activity to the integration stream
Although you've made the necessary changes in your own work area, the
changes haven't yet been propagated to the project. Moving changes made
for an activity (or activities) from a development work area to a project integration
work area is called a deliver operation.
Delivering changes to the project only when appropriate enables our developers
to work independently in parallel with each other while maintaining project
stability.
Now, deliver your completed activity to the project. Before you begin, be
sure that the target view for the delivery is up to date with the project.
- At the top of the ClearCase Navigator pane, right-click on the delivery
target view (alex_CLSICS_CD_int) and select Refresh > Update
from Repository.
- Click Apply to accept the defaults and update the target view. (See
Figure 17.)
Figure 17. Update the view
- Right-click on Alex's development view, and then select Deliver
> Default (Figure 18).
Figure 18. Begin the delivery
- Click OK on the delivery confirmation window.
ClearCase uses the information associated with your development stream to determine
which activities have been worked on and are ready to be delivered. Based on
that information, it detects which files need to be merged to your project's
Integration stream.
As long as there are no conflicts between your changes and changes made by
other developers on your project, the delivery will be completed without any
further intervention. In this example, however, there is a conflict.
When there are conflicts that require you to intervene, Rational ClearCase
will walk you through the process of resolving the conflicts.
- In the Deliver dialog box, click Yes to start the merge
tool.
- You will receive a prompt telling you that there is 1 (one) merge
point that needs to be resolved. Click OK to dismiss this dialog. You
can also click Run in background to dismiss the "Delivering from
stream" dialog.
Figure 19. Starting the merge
You are now presented with the ClearCase graphical merge client. You see that
there is a conflict between the changes that you made and the version that was
in your project's integration stream. But if you examine the difference, you
can see that the change that you made in your private development workspace
are, in fact, the correct changes, so you need to accept those changes.
- To resolve the differences, click the orange text that says "merge
needed" in the top pane of the window.
- The changes that you made previously are shown in the bottom-center pane
labeled 2. To accept those changes, click the 2 button on the toolbar
and then click the Resolve and advance button. After clicking the 2
button, you should see that your changes are reflected in the top pane.
- To save your changes, click the Save button on the toolbar.
- Click Yes on the Confirm Close Merge View window to close the merge
view.
Figure 20. Completing the merge
- Click the Complete Deliver button in the delivery summary pane
to finish the operation.
Figure 21. Completing the delivery
- Click the Resolution tab on the ClearQuest form.
- From the drop-down menu, select the Fixed resolution and then click
OK.
- Click OK at the prompt to dismiss the dialog
Before completing any deliver operations, our teams must ensure that the changes
that were delivered are good and don't affect other work in the integration
area. At this point, we normally recommend that teams run a build or test to
ensure that everything will still work after the deliver operation. Be sure
to take this step before completing the deliver operation because you can cancel
rather then complete the delivery.
However, for this training, you can simply complete this deliver operation.
Because this UCM project is integrated with Rational ClearQuest, you are automatically
transitioning the defect to the next stage of the workflow. Teams can choose
to automatically transition Rational ClearQuest defects to "Complete"
states on a per-UCM project basis.
Show a version tree
You may want to show a version tree of the Readme.html file. By looking at
the version tree of the file, you can get a graphical picture of what happens
during the deliver process. The deliver operation automatically takes private
changes from a developer's workspace and merges them into another stream.
Deliver operations can be performed between developers, to task streams, to
a common integration point, or even to teams working on different projects.
Follow these steps to view the version tree for this file:
- Select the Readme.html file.
- Right-click it and select Show Version Tree.
Figure 22. Showing the version tree
- By default, the version tree window will show a less-detailed version
of the element's version tree. Click Show Full Version Tree to
see the entire version tree.
The version tree will open with a magnifying glass icon next to the version
that your view is selecting. You will also notice that the defect that you were
working on (CLSIC00000058) is listed next to the version that you fixed. You
can see that a merge arrow was drawn from this version to the new version created
by the deliver operation.
Figure 23. Version tree details
|  |