Manual Code Merge?
Why does RTC not allow you to perform a manual interactive merge between the classes in 2 streams?
I'm promoting a chuck of code for a test delivery and am getting refusals based around a couple of classes.
Using the Patch function is *very* time consuming as if I take a change set and patch one of the classes inside it, I need to patch all the classes, which then throws up merge conflicts on any dependent classes in other packages, so I need to patch them, and so on. I've been at this for over 7 hours now and am nowhere near the finish, whereas if I could tell RTC "I know what I'm doing, take this line from file 1, this line from file 2 etc" I'd have had this completed in under an hour.
RTC is a great tool in many respects, but this is a major let down.
Any ideas?
I'm promoting a chuck of code for a test delivery and am getting refusals based around a couple of classes.
Using the Patch function is *very* time consuming as if I take a change set and patch one of the classes inside it, I need to patch all the classes, which then throws up merge conflicts on any dependent classes in other packages, so I need to patch them, and so on. I've been at this for over 7 hours now and am nowhere near the finish, whereas if I could tell RTC "I know what I'm doing, take this line from file 1, this line from file 2 etc" I'd have had this completed in under an hour.
RTC is a great tool in many respects, but this is a major let down.
Any ideas?
11 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 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
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
page 2of 1 pagesof 2 pages