CODEWITHSUNDEEP
clearcaseclearcase-ucmcleartool
Pulak Agrawal
Pulak Agrawal

Reputation: 2481

Moving elements in clearcase to be "merge" able

Ours is a typical implementation of clearcase UCM :

I have 2 UCM projects each of which represent a release for us. proj2 being created from a stable baseline from proj1

proj1 and proj2 work in parallel and sometimes same elements in both get changed simultaneously. So files a.java lies in both projects and is being worked upon by developers at both. A weekly merge activity happens where downstream gets the latest from upstream project and merges are reconciled.This is my easy life.

As a part of restructuring code, team with proj2 has started moving elements (files mostly) to other places. When I say other places this could mean within the component or to a different component VOB. This has never happened before.

The actual problem:

When an inter-project merge happens, the destination branch version of element a.java could have been moved to a different location/folder. How do I ensure clearcase still merges it with the version coming from upstream project. Is using the cleartool move command enough for clearcase to know and merge at the right place ? For inter-VOB movements, will cleartool relocate command do the same for me. I am in a tightly controlled environment else would have created a sandbox and tested it myself.

I am banking @VonC or @Tamir :)

Upvotes: 1

Views: 424

Answers (1)

VonC
VonC

Reputation: 1323593

When I say other places this could mean within the component or to a different component VOB

Note that with UCM, you cannot move elements to another component without re-creating completely said element (new history).

-For inter-vob component refactoring:

I would rather mirror the refactoring in proj1 (in a special Stream) and then attempt an inter-project merge from that stream, rather than hoping that a merge from an old directory structure to a new refactored directory structure goes well.

  • For outer-vob component refactoring (new history)

A manual merge is safer in that case.

Upvotes: 1

Related Questions