chnage flow target question
mehul Prajapati (181●2●55●54)
| asked Jul 27 '11, 3:07 p.m.
retagged Jun 26 '14, 4:07 p.m. by Dejan Custic (285●5)
Hi,
Have question about the flow target 1. i have stream A workspace 2. other developers checked in the code in stream A and i also checkin code 3. I see it as incoming changes for the code other devl checked in 4. i now change the flow target to stream b 5. i see all the changes i accepted at #3 as outgoing including mine and few other changes as in-coming 6. when i try to deliver only my changes to stream B it gives me error "delivering this changes will introduce gaps in the stream, you are trying to deliver a subset of outgoing change set but they need to be delivered together because of dependencies between them" what does this mean ? I see orange bi-directional arrows what does it represent. i see that one file is modified by many developers if i select one file it appears in blue and rest other file in ligt blue color is it because of dependency ? is it that my version of file is new and it needs the older version of file to be delivered first ? does it need to accept first all in-coming change before delivering outgoing change set ? |
2 answers
Geoffrey Clemm (30.1k●3●30●35)
| answered Jul 27 '11, 11:08 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
Comments below.
On 7/27/2011 3:08 PM, mehulnp wrote: Have question about the flow target Note that you checkin code to your workspace. You *deliver* code to a stream. So I'll assume you meant "other developers have delivered changes to stream A and I have also delivered changes to stream A". 3. I see it as incoming changes for the code other devl checked in That means that stream B did not have those changes from stream A. 6. when i try to deliver only my changes to stream B it gives me That means that the changes from those other developers must have modified at least one of the files that you modified, and that either you had accepted the changes from the other developers before you made your changes, or that you merged your changes with those of the other developers. I see orange bi-directional arrows what does it represent. i see that The orange bi-directional arrows indicate that those files have conflicts, i.e. both your changes and at least one of the incoming changes have modified the same file. When you select your outgoing file that is in conflict, it will highlight in blue the Unresolved file that it created for that conflict. is it that my version of file is new and it needs the older version of That is what the gap error message meant, but the orange arrow indicates a conflict, which requires you to do a merge to resolve the conflict, or suspend/discard one of the contributing change sets. does it need to accept first all in-coming change before delivering That is what you would do to resolve a "gap error" but would not resolve a "conflict". Cheers, Geoff Comments 
David Lafreniere
commented Jun 24 '14, 10:36 a.m.
| edited Jun 24 '14, 10:37 a.m.
FORUM MODERATOR / JAZZ DEVELOPER
Geoff has the correct answer to your question. I'll add some information related to gaps since that came up in part of your question.
Below are some videos which show this feature:
|
Merge gap Help is also here http://www-01.ibm.com/support/knowledgecenter/SSYMRC_5.0.0/com.ibm.team.scm.doc/topics/c_merging_changes_gaps.html?lang=en
|
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.