chnage flow target question
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 ?
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
Comments below.
On 7/27/2011 3:08 PM, mehulnp wrote:
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".
That means that stream B did not have those changes from stream A.
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.
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.
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.
That is what you would do to resolve a "gap error" but would not resolve
a "conflict".
Cheers,
Geoff
On 7/27/2011 3:08 PM, mehulnp wrote:
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
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
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
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
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 ?
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
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 ?
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
file to be delivered first ?
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
outgoing change set ?
That is what you would do to resolve a "gap error" but would not resolve
a "conflict".
Cheers,
Geoff
Comments
