merging scm270 ecc m03

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 1/24

Essentials of Rational ClearCase

Module 3: Merging to and from theIntegration Workspace

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 2/24

Explain how ClearCase merges versions of elements

Merge work to and from the integration area

Resolve merge conflicts using the Diff Merge tool

Upon completing this module, you should be able to:

Objectives

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 3/24

 Typical Developer ClearCase Workflow

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 4/24

Merging Overview

Merging is the process by which ClearCase propagates

changes from one branch to another   A merge combines the contents of 

two or more files or directories into

a new version of a file or directory

 After a merge, development can

continue on both branches

Future merges have no restriction

in either frequency or direction ClearCase includes automated

merge facilities for handling most

merge scenarios

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 5/24

Element Types and Merging

Every file in a VOB is associated with an element type

ClearCase uses element types to categorize and manageelements

Not all ClearCase element types can be merged

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 6/24

:Merging Policies

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 7/24

 Directories

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 8/24

Merge Algebra

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 9/24

 Types of Merges

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 10/24

Merging Versions in ClearCase

In ClearCase, you can merge in one of three ways:

Version TreeBrowser 

Merge Manager 

Command Line Interface

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 11/24

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 12/24

 Browser (cont.)

3

Click Yes toperform the merge.

4

Click OK to confirmthe merge.

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 13/24

 Browser (cont.)If there are no conflicting

changes, the mergeproceeds automatically

 As a result of the merge,ClearCase:

Copies the checked out fileto file.contrib

Places the results of themerge in the checked-out

version of the file

Records the merge in theVOB database

5

Check in the file to

complete the merge.

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 14/24

Merging with the Merge Manager

The Merge Manager provides a graphical interface for locating

files to be merged and for performing the merge Start > Programs > Rational > ClearCase > Merge Manager 

1

To start a newsession, click New.

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 15/24

 (cont.)

2

Select the view towhich you aremerging.

3

Select the specificelements that youwant to merge.

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 16/24

 (cont.)

4

Choose a method for selecting the

version of each element to merge.

Merge from LATEST element ona selected branch

Merge from elements according

to a specified label

Use a ClearCase querylanguage statement to select the“from” versions

Merge elements selected by aparticular view

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 17/24

 (cont.)

5

Provide additional information neededfor the merge, then click Finish.

6

Confirm the mergecriteria, then click Find.

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 18/24

 (cont.)

7

Click Yes to verify themerge elements.

8

Click OK to start the merge.

u

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 19/24

- u : Tool

Base contributor :

The original version

Contributor 1:

The version that youare delivering FROM

Contributor 2:

The version that youare delivering TO

Merge results pane

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 20/24

 Differences

Difference Indicators:

Signify that content was added, removed,or changed.

Navigational Buttons:

Use to move betweenmerge points.

Red arrow: Indicates where amanual merge isneeded.

Merge Buttons:

Click to move changes from thefirst, second, or third contributor pane to the merge results pane.

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 21/24

Merging Directories

 A directory merge:

Can process two or more versions of the same directoryelement

Results in a new directory version that reflects the contentsof all the contributors

Cannot process two different directory elements

To perform a directory merge:

Make sure the config spec selects the target version

Make sure all contributor versions are checked in

Check out the target version of the directory

Perform the merge immediately without making any other changes to the checked-out version

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 22/24

Merging Directories (cont.)

Resolving changes for directories in the Merge Tool is the same

as with files but with filenames instead of text.

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 23/24

How does the ClearCase merge algorithm work?

What element types can be merged? What element

types cannot be merged?

What are the three types of merges that the

ClearCase merge tool identifies? How does it handleeach merge type?

When merging versions, how does ClearCase

automatically resolve conflicts between contributors?

What is the Merge Manager? Why would you use it?

Module Review

d l b

8/2/2019 Merging Scm270 Ecc m03

http://slidepdf.com/reader/full/merging-scm270-ecc-m03 24/24

In this lab, you will perform the following tasks:

Merge using the Version Tree Browser 

Merge using the Merge Manager 

Resolve merge conflicts using the Diff Merge tool

Module Lab