Databases
StackOverflow2013
Postsdbo
POClearCase wants to merge unchanged files after deliver to alternate target
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POClearCase wants to merge unchanged files after deliver to alternate target
    primarykey
    data
    text
    <p>Using Rational ClearCase v. 7.0.1.1 with UCM, I have a problem here when using ClearCase's "Deliver from Stream to Alternate Target" functionality.</p> <p>Imagine we have one project integration stream and two developer streams A and B derived from it. Now I change a file in stream A. I want the delevoper owning stream B to be able to use my work without me having to deliver the file to the integration stream yet, so I deliver from stream A to the alternate target stream B.</p> <p>So far, so good. I go on making another change to the file but the stream B developer does not need this change, so I don't deliver it to him.</p> <p>After some more time, I deliver my work to the main integration stream. This works fine, although I wonder why ClearCase marks the merge as a normal "Merged" instead of "Merged (trivial)" - no one except me has made changes to the file.</p> <p>After the delivery, a new baseline is created on the main integration stream.</p> <p>The real problem arises when developer B tries to rebase his stream. Since developer B has never made any changes to the file, I'd expect the merge to be a trivial one with no interaction necessary. But what happens is that developer B is forced to resolve a merge conflict on that file graphically, letting him choose between the base version on the integration stream, the version I delivered to him and the version that I delivered to the integration stream. </p> <p>The confusion goes on when after resolving the merge and completing the rebase, developer B wants to perform a delivery to the main integration stream. Apart from the activity that I originally delivered to him, he is also offered to deliver an activity that is named rebase_..., which I would never expect to be offered for delivery.</p> <p>Am I missing something here? Are we using ClearCase incorrectly or is this a known limitation / bug? Has anyone experience with this functionality?</p> <p>Thanks in advance for your help!</p> <p>Jan</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USMat
    1. USJan
    plurals
    1. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POClearCase wants to merge unchanged files after deliver to alternate target
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POClearCase wants to merge unchanged files after deliver to alternate target
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POClearCase wants to merge unchanged files after deliver to alternate target
      1. This table or related slice is empty.
      1. VTUpMod
    1. COI have to leave for 2 hours, but I will try to make a test UCM project and check if I do see a conflict in my config (CC7.0.1)
      singulars
      1. POClearCase wants to merge unchanged files after deliver to alternate target
      1. USVonC
    2. COThanks, that would be great!
      singulars
      1. POClearCase wants to merge unchanged files after deliver to alternate target
      1. USJan
    3. COTest added, trivial merges only, no conflict experienced. See my comments before the test for ideas or suggestions.
      singulars
      1. POClearCase wants to merge unchanged files after deliver to alternate target
      1. USVonC
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload