It's all about the answers!

Ask a question

How to deliver a change set when there would be a gap


eric nolmans (281510) | asked May 24 '11, 10:09 a.m.
edited Nov 08 '16, 10:59 a.m. by David Lafreniere (4.0k7)
Hello,

let me try to explain my problem.
I have 2 developers A and B working together on the same file.
Dev A deliver his changes and create a work item.
Dev B deliver another change on the same file and create also a work item.

now I accept those changes and I want to deliver the changes of Dev B to another stream using change flow target.

how can I realize this operation?
where can I find documentation that explains this process?

thanks

Eric

Accepted answer


permanent link
David Lafreniere (4.0k7) | answered Jun 20 '14, 4:27 p.m.
FORUM MODERATOR / JAZZ DEVELOPER
In RTC 4.0.5 we delivered additional support when trying to accept change sets which have a gap. In these circumstances, you can follow a gap workflow that accepts one change set at a time and, for change sets that contain gaps, creates a new change set that contains the equivalent changes.
This feature is summarized in the RTC 4.0.5 'New & Noteworthy' page:  https://jazz.net/downloads/rational-team-concert/releases/4.0.5?p=news#scm-improve-usability-405-m1
Below are some videos which show this feature:
-Accepting multiple change sets with gaps in the RTC 4.0.5 client for Eclipse IDE: https://www.youtube.com/watch?v=28raag5RdzU
-Accepting a change set with a gap in the RTC 4.0.5 client for Eclipse IDE: https://www.youtube.com/watch?v=TucVu_BgB7E

In RTC 5.0 we added a "fill the gap" feature where the change sets that fill the gap are shown to the user, allowing them to either accept all the change sets or to continue with the gap workflow that was available in RTC 4.0.5.
This feature is summarized in the RTC 5.0 'New & Noteworthy' page: https://jazz.net/downloads/rational-team-concert/releases/5.0?p=news#eclipse-fill-gaps

Both features are explained in detail in the "Improved Gap Handling for SCM" article: https://jazz.net/library/article/1372
Michael Valenta selected this answer as the correct answer

One other answer



permanent link
Tim Mok (6.6k38) | answered May 24 '11, 10:42 a.m.
JAZZ DEVELOPER
https://jazz.net/jazz/resource/itemName/com.ibm.team.workitem.WorkItem/149483 The story on handling gaps may be of interest to you.

For now, you could suspend both change sets. Resume the Dev B change set and resolve the conflict. Then you can deliver the merge change set and the Dev B change set to the other flow target.

Comments
eric nolmans commented May 24 '11, 2:14 p.m. | edited Nov 08 '16, 11:00 a.m.

thank you for the information about handling gaps.


I had the idea to use reverse but :

    reverse happens on a change sets and create a patch;
    I need to apply this patch;
    create a new change sets and deliver this change set;
    after that I can deliver to another stream;


it seems very difficult to deliver what we want and not what RTC wants.

Eric


Tim Mok commented May 24 '11, 4:18 p.m. | edited Nov 08 '16, 11:00 a.m.
JAZZ DEVELOPER
thank you for the information about handling gaps.


I had the idea to use reverse but :
    reverse happens on a change sets and create a patch;
    I need to apply this patch;
    create a new change sets and deliver this change set;
    after that I can deliver to another stream;



it seems very difficult to deliver what we want and not what RTC wants.

EricYou could use reverse and also deliver the Dev A change set along with the reversal change set. Although, I find it easier to understand what I'm doing by discarding the Dev A change set.

Another way of doing what I describe is creating a patch after suspending both change sets. You can go into the Dev A change set and create a patch of what you want (or the entire change set) and merge the change into the workspace. Then you can check-in the change from the patch and resume the Dev B change set.

Your answer


Register or to post your answer.