It's all about the answers!

Ask a question

How do you find missing changesets if there is a gap in the timeline?


Peter Weller (39379) | asked Feb 18 '13, 3:25 p.m.
retagged Jun 25 '14, 2:04 p.m. by David Lafreniere (4.4k7)
When accepting a changeset to a different stream, I often get an alert that there are gaps in the timeline. How do I view which changesets are missing from the target stream so that I can make a better decision about whether I should accept them or perform a merge?

Accepted answer


permanent link
Geoffrey Clemm (29.4k23035) | answered Feb 18 '13, 4:28 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
edited Feb 21 '13, 1:56 p.m.
In the current release (4.0.1), this is a manual process.
There are high priority work items designed to help automate this.

One workaround is:
Open the change set that you cannot accept in the change explorer.
Select one of the files in the change set, and open that file in the "history" view.
Try to accept all of the change sets for that file.  
If that still fails with gaps, find the earliest change-set in that history that you don't have in your workspace (you can use the "Locate Change Sets" operation to help with that).  And start accepting that and its successor change sets until you hit a gap.   Look at the change set with a gap, and start doing the same operation on another file in that other change set.
Peter Weller selected this answer as the correct answer

Comments
Peter Weller commented Feb 20 '13, 3:01 p.m.

Thanks! Is there any chance you could you provide the relevant story/stories so I can track them? 


Geoffrey Clemm commented Feb 21 '13, 2:33 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER

A top level plan item is [CCM] improve scm merge handling - gaps (170001)
There are two alternatives to handling gaps: "filling the gaps" (what this question is about) and "backing out the gaps" (accepting a variant of the change set with the changes from the gap backed out).   There is a lot of work currently targeted for the 4.0.3 release on backing out the gaps, but the work on the "filling the gap" alternative hasn't really started.   The top level plan item for "filling the gap" is As a user, I would like to have the option of filling the gap when gaps are encountered (244998) .


David Lafreniere commented May 12 '14, 3:05 p.m. | edited May 12 '14, 3:06 p.m.
FORUM MODERATOR / JAZZ DEVELOPER

The "Filling the Gap" feature "Story 244988: As a user, I would like to have the option of filling the gaps when gaps are encountered" is currently scheduled to be released in RTC 5.0


David Lafreniere commented Jun 25 '14, 1:59 p.m.
FORUM MODERATOR / JAZZ DEVELOPER

Here is a more complete summary of the gap work and relevant links:

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

<continue reading my comment below>


David Lafreniere commented Jun 25 '14, 1:59 p.m.
FORUM MODERATOR / JAZZ DEVELOPER

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

The classes that are involved for filling the gap include (available in RTC 5.0):
client side: IWorkspaceConnection.findChangeSetsToAcceptToFillGap(...)
server side: IScmQueryService.findChangeSetsToAcceptToFillGap(...)

Both features are explained in detail in the "Improved Gap Handling for SCM" article: https://jazz.net/library/article/1372

Your answer


Register or to post your answer.