Delivering from one stream to another?

micjohnson997 wrote:

I must be missing something simple here. We have set up two levels of
streams for integration - the "lower" one is for one of our
sub-teams to work on a subset of components, and the
"higher" one is for the overall product integration.

Some developers have repository/local workspaces that flow to the
"lower" stream. They do a check in and deliver, and the
code changes make it to the "lower" stream (through the
repo workspace).

The "lower" stream's flow target is the "higher"
stream. However, how do I actually get the lower stream to deliver
into the higher stream? I can't see any options anywhere that allow
this...

Thanks,
Mike

You have to do that step manually. Jazz SCM does not yet provide this
support.

Sorry,
JohnC
SCM Server

Sorry, I am a newbie, so can you elaborate more on how to do it manually? Or point me to a help section that explains it?

Thanks,
Mike

A flow from stream to stream always happens via a workspace (so that you
have a file area to resolve any merge-conflicts that occurs during the
flow).

So to flow changes from one stream to another, you would commonly select
some workspace that currently flows to the lower stream, and add the
upper stream as an additional flow target of that workspace.

When you are ready to flow changes from the lower stream to the upper
stream, you would:
- accept all changes from the lower stream
- change the flow target of the workspace to the upper stream, ("change
flow target" is an operation on a workspace)
- accept all changes from the upper stream
- resolve any merge-conflicts that have occurred
- deliver the changes to the upper stream.
- change the flow target of the workspace to be the lower stream.
- at this point you have two options:
- if you want to flow the changes from the upper stream to the lower
stream, just deliver to the lower stream
- otherwise, execute the "replace with contents of stream" operations
in the pending changes view, which would reset your workspace to be the
current contents of the lower stream (without the changes from the upper
stream, or any of the merge change-sets you may have created to resolve
conflicts caused by changes from the upper stream).

Cheers,
Geoff

micjohnson997 wrote:

I must be missing something simple here. We have set up two levels of
streams for integration - the "lower" one is for one of our
sub-teams to work on a subset of components, and the
"higher" one is for the overall product integration.

Some developers have repository/local workspaces that flow to the
"lower" stream. They do a check in and deliver, and the
code changes make it to the "lower" stream (through the
repo workspace).

The "lower" stream's flow target is the "higher"
stream. However, how do I actually get the lower stream to deliver
into the higher stream? I can't see any options anywhere that allow
this...

Thanks,
Mike

In that case, what Flow Target means in a Stream configuration? I mean,
what can I do setting a Flow Target in Stream A to Stream B? If I
understood correctly, this won't do anything. Right?

Thanks in advance,

Chemi.

Geoffrey Clemm wrote:

A flow from stream to stream always happens via a workspace (so that you
have a file area to resolve any merge-conflicts that occurs during the
flow).

So to flow changes from one stream to another, you would commonly select
some workspace that currently flows to the lower stream, and add the
upper stream as an additional flow target of that workspace.

When you are ready to flow changes from the lower stream to the upper
stream, you would:
- accept all changes from the lower stream
- change the flow target of the workspace to the upper stream, ("change
flow target" is an operation on a workspace)
- accept all changes from the upper stream
- resolve any merge-conflicts that have occurred
- deliver the changes to the upper stream.
- change the flow target of the workspace to be the lower stream.
- at this point you have two options:
- if you want to flow the changes from the upper stream to the lower
stream, just deliver to the lower stream
- otherwise, execute the "replace with contents of stream" operations
in the pending changes view, which would reset your workspace to be the
current contents of the lower stream (without the changes from the upper
stream, or any of the merge change-sets you may have created to resolve
conflicts caused by changes from the upper stream).

Cheers,
Geoff

That is correct. In RTC-2.0, setting the Flow Target of a stream is
just a comment, and has no semantic effect on the GUI or any of the SCM
operations.

Note: I have submitted a request that the declared Flow Target of a
stream be used to support a "promote" operation, that promotes the
configuration of the source stream to the target stream (work item 86817).

Cheers,
Geoff

Chemi wrote:

In that case, what Flow Target means in a Stream configuration? I mean,
what can I do setting a Flow Target in Stream A to Stream B? If I
understood correctly, this won't do anything. Right?

Thanks in advance,

Chemi.

Geoffrey Clemm wrote:
A flow from stream to stream always happens via a workspace (so that
you have a file area to resolve any merge-conflicts that occurs during
the flow).

So to flow changes from one stream to another, you would commonly
select some workspace that currently flows to the lower stream, and
add the upper stream as an additional flow target of that workspace.

When you are ready to flow changes from the lower stream to the upper
stream, you would:
- accept all changes from the lower stream
- change the flow target of the workspace to the upper stream,
("change flow target" is an operation on a workspace)
- accept all changes from the upper stream
- resolve any merge-conflicts that have occurred
- deliver the changes to the upper stream.
- change the flow target of the workspace to be the lower stream.
- at this point you have two options:
- if you want to flow the changes from the upper stream to the lower
stream, just deliver to the lower stream
- otherwise, execute the "replace with contents of stream"
operations in the pending changes view, which would reset your
workspace to be the current contents of the lower stream (without the
changes from the upper stream, or any of the merge change-sets you may
have created to resolve conflicts caused by changes from the upper
stream).

Cheers,
Geoff

That is correct. In RTC-2.0, setting the Flow Target of a stream is
just a comment, and has no semantic effect on the GUI or any of the SCM
operations.

Does the flow target of a stream do anything in RTC-3.0?

Does the flow target of a stream do anything in RTC-3.0?

Since 3.0.1, you can drag a stream to Pending Changes or right-click Show In -> Pending Changes to track it. The stream will need a flow target to show the changes between two streams. It allows you to flow changes between streams without the use of a workspace. However, you'll still need a workspace to resolve conflicts.

In RTC-3.0.1, you can use the Pending Changes view to flow
non-conflicting changes directly from one stream to another stream, and
the flow-target of a stream has the same semantics as the flow-target of
a worksapce. I'm not sure whether that functionality was first
introduced in 3.0 or 3.0.1.

Cheers,
Geoff

On 5/16/2011 1:08 PM, kbehrens wrote:

gmclemmwrote:
That is correct. In RTC-2.0, setting the Flow Target of a stream is

just a comment, and has no semantic effect on the GUI or any of the
SCM
operations.

Does the flow target of a stream do anything in RTC-3.0?