Accepting Changeset which are dependent on other changeset
![]()
Sheeraz Junejo (16●4●3)
| asked May 09 '12, 10:47 a.m.
retagged Jun 23 '14, 2:43 p.m. by David Lafreniere (4.8k●7)
Hi,
We have two stream one is called MAIN and another is called PB. Every month we accept all changes put in MAIN to PB and release a monthly PB. This time the monthly PB got bit late and we have quit a lot of change set to accept. The problem is when we are trying to accepting changeset it says following; "The repository workspace you are accepting this changeset into doesn't have all the change sets that led upto this change set. Yon can try applying the contents of the change set as a patch or you could try and accept more change sets together" Now, message is self explanatory but how to find out which change sets are before this one? Also what is the level of change set RTC keep track of? I mean is it changes submited on stream level or a single Component within a stream? NOTE: PB = Project Build Could you please help us sorting out this problem because there are many change sets to accept and it will waiste so much time if we have to patch evry single one of them Thanks -- Sjunejo |
3 answers
![]()
In RTC 4.0.5 we delivered additional support when trying to accept change sets which have a gap (often encountered when trying to backport fixes). In a very brief summary of the feature, when you accept change sets with a gap, you can now follow a gap workflow that accepts one change set at a time and, for change sets that contain gaps, creates a new change set (with aided traceability), that contains the equivalent changes. This means users will not have to accept the change sets 'as a patch. Applying change sets as a patch has limitations compared to the new workflow (as discussed in the article below).
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 Please also read the 2 other comments from David Olsen and Geoffrey Clemm as they are also related to the question |
![]()
Geoffrey Clemm (30.1k●3●30●35)
| answered May 10 '12, 10:14 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
If you are accepting all changes from MAIN into PB, then you should never get a "gap" conflict. I do remember there were some issues in earlier versions of RTC, where if you multi-selected a large number of change-sets, it sometimes accepted them out-of-order and reported a gap, when in fact there wasn't one. But if you click on "accept all" instead of multi-selecting, you should be able to avoid that behavior. Using the "replace in stream" method is another workaround, but that shouldn't be necessary if you are flowing all changes.
Cheers, Geoff Hi, |