It's all about the answers!

Ask a question

RTC SCM Merge to stream with re-organised structure


David Beange (11135390) | asked May 15 '18, 9:28 a.m.
edited May 17 '18, 8:51 a.m.
CLM 6.0.1

We have a new project (B) where the Source code was initially set up from our existing project (A). We are now a number of months down the road and need to refresh Project B with the updates that have been made to Project A.

Normally we would do this by loading a workspace with all changesets and repoint the Flow Diagram and identify the delta to merge from Pending changes.
However since the original code cut Project B has had a Component reorg and instead of everything being in one component "Source" they have been split out to more appropriate named components with the folder and file structure below that staying the same.
Is there a way to to a merge to refresh the new Project B. (see sample structure below). My understanding is that a changeset is related to a specific component and because of the underlying UUID's it is not a straightforward case to merge if at all possible with out doing compares in external tools first and then manually apply changes

Project A

Source

               Folder 1

               Folder 2

                              Sub-folder1

                                             File A

 

Project B

Apps

               Folder 1

Services

               Folder 2

                              Sub-folder1

                                             File A

Accepted answer


permanent link
Geoffrey Clemm (30.1k23035) | answered May 17 '18, 9:28 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER

If they split the components by using one of the RTC "move in repository" operations, then you can tell RTC to apply an accepted change set to the component the files were moved to.   If they didn't use a "move in repository" operation (i.e. just copied the files to the new component, and deleted them from the old component", then you might be able to apply the change sets by creating a "patch" from the change set (not sure about that ... it's been a while since I've played with the "patch" functionality.

David Beange selected this answer as the correct answer

Comments
David Beange commented May 18 '18, 5:07 a.m.
Hi Geoff, Thanks for the response. Looking further at the "move in repository" we have found a "right-cick" option within pending changes for "Apply to Other Component" so we are exploring that. This would seem to be what you are saying about applying the accepted change to a different component.

Thanks

Geoffrey Clemm commented May 18 '18, 2:23 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER

Yes, that is the way you apply change sets from one component to another component to which those files have been moved. 

Your answer


Register or to post your answer.