RTC codes merge between multi streams parallel development
Hi ,
we have a stream A and stream B ,and had the same file in the same location,just like 'src/test.java',and the content of file in stream A like below , 'function a {} function b{}'; and the content of file in stream B like this , 'function a{} function c{}'; Now,i want to deliver stream B to A,and the file be modified like this , 'function a{} function b{} function c{}' How will i do it ... need your help ,thanks ... |
11 answers
|
Hi~any body here ?.......
Hi , |
Geoffrey Clemm (30.1k●3●30●35)
| answered Nov 24 '11, 12:53 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
In order to merge a conflict, you have to have a workspace.
In your example, you would create a workspace on stream A, then change the flow target of the workspace to be stream B. Then in the Pending Changes view, accept the incoming changes from stream B. This will result in a merge conflict, which cannot be auto-resolved. Select the "open in compare editor" operation on the conflict. In the compare editor, make the modification you want (such as the one described below), and save the change, and select "resolve as merged" in the compare tool. Then change the flow target back to stream A and deliver the results to stream A. Cheers, Geoff On 11/23/2011 9:23 PM, fanxin wrote: Hi , |
|
Hi, Geoffrey ,Thanks a lot !
I tried as what you say,but did not find no incoming changes in Pending Changes,and i tried to create the two stream use the same component,and then they are the same as what you say. But,still seemed not so correct. I am writing a document on how to do it ,and will send out asap,can you please kindly see it if correct? Thanks a lot ! In order to merge a conflict, you have to have a workspace. Hi , |
There is one very common error, and that is forgetting to save. When you change the current flow target, click the "Save" button on the top-right of your repository workspace window. RTC will only then update the pending changes view. Alternatively, configure the pending changes view so that it shows all flow targets, not just the current one. Concerning your "I tried to create the two streams", you should already have them. One is where the file contains A and B, the other is where it contains A and C. Good luck! Uli |
|
Yes, i already have the two streams,and will try it again.
Thans for your kindly remind~
There is one very common error, and that is forgetting to save. When you change the current flow target, click the "Save" button on the top-right of your repository workspace window. RTC will only then update the pending changes view. Alternatively, configure the pending changes view so that it shows all flow targets, not just the current one. Concerning your "I tried to create the two streams", you should already have them. One is where the file contains A and B, the other is where it contains A and C. Good luck! Uli :D :D :D |
|
Geoffrey Clemm (30.1k●3●30●35)
| answered Nov 24 '11, 2:08 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
Two more hints:
- If you look in the Pending Changes view, the arrow next to the workspace points to the Stream you are currently flowing changes with. - If you right click on the workspace in the Pending Changes view, you can select "change flow target" (and you don't have to remember to save anything). Cheers, Geoff On 11/24/2011 5:08 AM, fanxin wrote: Yes, i already have the two streams,and will try it again. |
|
Thanks very much!
One last question,is the premise that the two Streams must have the same component (example . Test Control Component), since they should contain the same documents and files in the original at first. Two more hints: Yes, i already have the two streams,and will try it again. |
|
In order to make sure Development Enviroment and Another have the same version,We want to freeze the Development stream when download codes to Another.
Did there have a 'Lock function' or 'Freeze function' on a Stream? Like the lock on a single file. Thanks. :D |
|
Geoffrey Clemm (30.1k●3●30●35)
| answered Nov 25 '11, 11:23 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
You can combine different components from different streams into a
single workspace ... but you only get a conflict if you are accepting parallel changes to the same component. Cheers, Geoff On 11/24/2011 10:38 PM, fanxin wrote: Thanks very much! |
|
Geoffrey Clemm (30.1k●3●30●35)
| answered Nov 25 '11, 11:38 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
In the Process Configuration of the process area that owns the stream,
you can specify what roles are allowed to update the stream. So you give that role to only a single user at a time. Cheers, Geoff On 11/25/2011 1:53 AM, fanxin wrote: In order to make sure Development Enviroment and Another have the same |
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.