It's all about the answers!

Ask a question

How can we merge the changes from one stream to other automatically even if the file location is changed


vinay kumar bondugula (7311948) | asked Jul 18 '19, 6:52 a.m.

 Hi All,


We had a request from our development team that they want use a legacy stream and need to merge latest stream  to old/legacy stream. The issue is on latest stream the files are moved according to the requirement within the stream. Now, when we try to merge the latest stream to legacy stream developer expectation is to find a process to merge the files in original location without loosing history of the file. Also, can auto merge scripts be changed to mention to do auto merge at sub folder level. Please let me know in case of any information.

Thanks,
Vinay

One answer



permanent link
Geoffrey Clemm (30.1k23035) | answered Jul 18 '19, 10:33 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER

 As long as the files were moved with a "move" command within one of the RTC GUIs, then your developer expectation is correct ... RTC will merge the files to the renamed locations.  If on the other hand, the files were moved using native file system commands in a loaded sandbox, then RTC will have seen the move as a delete of the old file and a create of a new file.   To check whether the move was done properly, look at the history of the renamed file in RTC ... if the move was done properly, you would see the "pre-move" versions in the history.


When you say "the auto merge scripts", do you mean the RTC "scm accept" command?   If so, it will automatically merge unless you specify the --no-merge parameter.

Your answer


Register or to post your answer.