It's all about the answers!

Ask a question

SCM: Flow Targets and Gaps/Patches


Scott Exton (1143) | asked Nov 04 '13, 9:59 p.m.
retagged Jun 26 '14, 11:13 a.m. by Dejan Custic (2855)
I currently have two different source streams, development and stable.  The idea is that ongoing development would occur in the development stream, and when the changes are production-ready they will be promoted to the 'stable' stream.  I plan to use flow-targets to handle the 'promotion' from the development stream to the stable stream (i.e. change the flow target of my local 'stable' workspace and then accept change sets from the development stream).

I did however have a question around gaps and patches.  I realise that if you don't accept all change sets from the development stream you will sometimes create gaps in the history of a file, and this is handled by the 'patching' capabilities of RTC (i.e. you create a patch from the change set and then apply the patch to your workspace).

However, if you create a patch for a particular change set is there any way to 'mark' the change set so that it no longer appears in the 'pending changes' view?  I'm currently relying on the 'pending changes' view so that I know which change sets still need to be promoted, and I am worried that change sets which are promoted via a patch will forever appear in the 'pending changes' view.

Any advice would be appreciated.

Thanks.

3 answers



permanent link
Piotr Aniola (3.7k1635) | answered Nov 05 '13, 7:59 a.m.
The following workitem deals with the issue of gaps:
It basically implements cherry-picking of change-sets without having to worry about patches. It is only available as os version 4.0.5.

I'm not sure if it's possible to remove patched change sets from Pending Changes.

Comments
Matt Lennon commented Nov 05 '13, 8:37 a.m.
JAZZ DEVELOPER

There's a "New and Noteworthy" article for the new gap handling features in the upcoming RTC 4.0.5 release. It includes links to videos demonstrating the features.


-Matt


Scott Exton commented Nov 05 '13, 7:27 p.m.

This is exactly what I am after, especially the concept of 'port equivalence'.  I realise that we are currently at RTC 4.0.5 RC1, but does anyone know when 4.0.5 will be formally released?

Thanks.


Piotr Aniola commented Nov 06 '13, 3:53 a.m.

4.0.5 should be out any time now, a few weeks at most.


permanent link
David Lafreniere (4.6k7) | answered Jun 20 '14, 4:30 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

permanent link
Dejan Custic (2855) | answered Jun 26 '14, 11:12 a.m.
FORUM MODERATOR / JAZZ DEVELOPER
The 5.0 Help link is also here http://www-01.ibm.com/support/knowledgecenter/SSYMRC_5.0.0/com.ibm.team.scm.doc/topics/c_merging_changes_gaps.html?lang=en

Your answer


Register or to post your answer.