UCM rebase operation results in error: Can't revert to earlier baseline

Technote (troubleshooting)


Problem(Abstract)

Attempts to run the IBM Rational ClearCase UCM rebase operation results in the error "Can't revert to earlier baseline 'baseline name' of component 'component name' because the stream has made changes based on the current baseline".

Symptom

Attempts to rebase from the integration stream to the development stream while set into the development view executing the cleartool rebase -recommended command results in the following error messages:

% cleartool rebase -recommended
cleartool: Error: Can't revert to earlier baseline "seats_INITIAL"
of component "seats" because the stream has made changes
based on the current baseline.
cleartool: Error: Can't revert to earlier baseline "tires_INITIAL"
of component "tires" because the stream has made changes
based on the current baseline.
Adding baseline "color_schemes" of new component "color"
cleartool: Error: Unable to rebase stream "car_dev01".

% cleartool rebase -complete
cleartool: Error: No baselines specified.  Use "-recommended" or "-baseline <baseline-selector>"
to specify baselines from which to rebase.
cleartool: Error: Unable to rebase stream "car_dev01
".

Cause

The stream was rebased previously from a baseline in the integration stream that is newer than the one that is currently recommended in the integration stream.

Resolving the problem

Procedure:

  1. Obtain a list of the latest baselines that can be recommended by running the command cleartool lsbl -component command on every component:

    Note: This example uses two components Tires and Seats.

    % cleartool lsbl -component tires@/vobs/man_pvob
    31-Dec-01.11:56:41  tires_INITIAL  username   "tires_INITIAL"
    component: tires@/vobs/man_pvob
    31-Dec-01.13:07:37  deliverbl.car  username   "deliverer"
    stream: car_dev01@/vobs/man_pvob
    component: tires@/vobs/man_pvob
    31-Dec-01.16:29:43  car_1  username   "me"
    stream: car_integration@/vobs/man_pvob
    component: tires@/vobs/man_pvob


    % cleartool lsbl -component seats@/vobs/man_pvob
    31-Dec-01.11:56:22  seats_INITIAL  username   "seats_INITIAL"
    component: seats@/vobs/man_pvob
    31-Dec-01.13:07:35  deliverbl.car  username  "deliverer"
    stream: car_dev01@/vobs/man_pvob
    component: seats@/vobs/man_pvob
    31-Dec-01.16:29:43  car123  username   "me"
    stream: car_integration@/vobs/man_pvob
    component: seats@/vobs/man_pvob

  2. Run the command cleartool chstream -recommended :

    Note: Review the man page on chstream (cleartool man chstream) for more details.
    %  cleartool chstream -recommended car_1@/vobs/man_pvob,car_1.676@/vobs/man_pvob car_integration@/vobs/man_pvob
    Changed stream "car_integration@/vobs/man_pvob".

    Once this has been done, the recommended baseline should no longer be one that is older than the latest baseline in the integration stream.

  3. Set into the development view, and run cleartool rebase -recommended:

    % cleartool rebase -recommended
    Adding baseline "color_schemes" of new component "color"
    Updating rebase view's config spec...
    Creating integration activity...
    Setting integration activity...
    Merging files...
    No versions require merging in stream "car_dev01".
    Build and test are necessary to ensure that the merges were completed correctly.
    When build and test are confirmed, run "cleartool rebase -complete".

  4. Run cleartool rebase -complete to complete the rebase process:
    % cleartool rebase -complete
    Rebase in progress on stream "car_dev01".
    Started by "me" at 01/07/02 14:19:44.
    Merging files...
    No versions require merging in stream "car_dev01".
    Checking in files...
    Clearing integration activity...
    Updating stream's configuration...
    Cleaning up...
    Rebase completed.

Related information

About recommended baselines in UCM

Rate this page:

(0 users)Average rating

Document information


More support for:

Rational ClearCase
UCM: Rebase

Software version:

7.0, 7.0.1, 7.1, 7.1.1, 7.1.2, 8.0

Operating system(s):

AIX, HP-UX, Linux, Solaris, Windows

Reference #:

1126169

Modified date:

2013-05-03

Translate my page

Machine Translation

Content navigation