Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <blockquote> <p>list all the versions in C which have been created by merging from A </p> </blockquote> <p>Those versions should be listed in the merge activity you has to create when you merged directly from A to C (using <code>findmerge</code>, I presume). </p> <p>The only problem is, did you create a special "merge" activity during that <code>findmerge</code>?<br> You may just have reused the current activity on C, meaning that activity would contain versions from the current work on C, plus the versions merged from A.</p> <p>The other approach would be to merge the same activities (the ones concerned by the findmerge from A to C) from A to B.<br> The next "normal" merge from B to C would:</p> <ul> <li>do nothing for files already merged from A (since they have also been merged to B according this "other approach"</li> <li>merge evolutions from B to C for any other modified files.</li> </ul> <hr> <blockquote> <p>I didn't use it for these merges, did it from the GUI version tree tool creating identical activities in C for corresponding activities in A and merged file by file.</p> </blockquote> <p>Unless you have only one or two files to merge, <code>findmerge</code> is <em>the</em> command to use, because: </p> <ul> <li>it can takes into account one or several activities</li> <li>and it is not bound by the same "activities dependencies" than the ones enforced with a deliver or a rebase UCM operation.</li> </ul> <p>In short, <code>findmerge</code> is your classical merge, able to read versions within UCM activities, but does a non-UCM merge (no hyperlink between UCM baselines).</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

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