It's all about the answers!

Ask a question

RTC: How do I find out what changeset conflicts with the one I am trying to accept?

Ivan Bilicki (1112) | asked Oct 11 '12, 10:54 a.m.
retagged Jun 24 '14, 10:26 a.m. by David Lafreniere (4.8k7)

I have a repository workspace which has a stream with many incoming changesets. I am trying to accept one without accepting all the ones leading up to it. A dialog box comes up informing me that the workspace doesn't have all the changesets leading up to the one I am trying to accept (and that I can apply it as a patch if I want).

My question is... how do I know what changesets I need to accept so that I can accept my original changeset normally? I know I can look at file history, but this is not ideal as changesets can span multiple files.

Is there some kind of a view to see dependencies between changesets maybe?



Alex Fitzpatrick commented Oct 11 '12, 12:00 p.m.

This is something that I have also struggled with on occasion. After four years of usage I'm still to find a good approach. It has the feel of a missing feature to me.

2 answers

permanent link
Geoffrey Clemm (30.1k33035) | answered Oct 11 '12, 12:12 p.m.
This is a high priority enhancement which is under investigation for the next release of RTC.   See plan item [CCM] Technical investigation of Merge gap handling (218181)

permanent link
David Lafreniere (4.8k7) | answered Jun 24 '14, 10:26 a.m.
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:
Below are some videos which show this feature:
-Accepting multiple change sets with gaps in the RTC 4.0.5 client for Eclipse IDE:
-Accepting a change set with a gap in the RTC 4.0.5 client for Eclipse IDE:

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:

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:

Your answer

Register or to post your answer.

Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.