branches in jazz
Newbie question.
I understand workspace and streams.
I have to work in this fairly complex project along with a few other developers.
We have to share code between ourselves before we merge the changes back into the stream.
Can I use my workspace as a 'branch' ? ie, can many developers work against the same workspace? When we are ready, we can deliver our changes to the stream and merge the differences?
Or is there a concept of branch in Jazz?
TIA.
I understand workspace and streams.
I have to work in this fairly complex project along with a few other developers.
We have to share code between ourselves before we merge the changes back into the stream.
Can I use my workspace as a 'branch' ? ie, can many developers work against the same workspace? When we are ready, we can deliver our changes to the stream and merge the differences?
Or is there a concept of branch in Jazz?
TIA.
4 answers
Yes, you can use your workspace as a "personal branch".
Only one developer can make changes to a given workspace (only the owner
of the workspace can make changes to it).
You can accept changes directly from another workspace (instead of
getting changes from a common stream) by adding the other workspace as
one of the "flow targets" of your workspace, and then "accept"
change-sets from that other workspace, just as you accept changes from a
stream.
But you cannot "deliver" your changes to a workspace owned by another
user (they would have to "accept" your changes).
But streams are very lightweight objects in Jazz, so you might want to
just set up a separate stream for that sharing ... the advantage of a
stream is that the "deliver" operation tells your team members that
"this is ready to be picked up". If they accept directly from your
workspace, they will pick up random stuff that you might not be ready
for them to see/use.
Cheers,
Geoff
anandsan wrote:
Only one developer can make changes to a given workspace (only the owner
of the workspace can make changes to it).
You can accept changes directly from another workspace (instead of
getting changes from a common stream) by adding the other workspace as
one of the "flow targets" of your workspace, and then "accept"
change-sets from that other workspace, just as you accept changes from a
stream.
But you cannot "deliver" your changes to a workspace owned by another
user (they would have to "accept" your changes).
But streams are very lightweight objects in Jazz, so you might want to
just set up a separate stream for that sharing ... the advantage of a
stream is that the "deliver" operation tells your team members that
"this is ready to be picked up". If they accept directly from your
workspace, they will pick up random stuff that you might not be ready
for them to see/use.
Cheers,
Geoff
anandsan wrote:
Newbie question.
I understand workspace and streams.
I have to work in this fairly complex project along with a few other
developers.
We have to share code between ourselves before we merge the changes
back into the stream.
Can I use my workspace as a 'branch' ? ie, can many developers work
against the same workspace? When we are ready, we can deliver our
changes to the stream and merge the differences?
Or is there a concept of branch in Jazz?
TIA.
Now, after I am done with my work on my private stream, is it an easy process to merge my changes back into the parent stream?
It's all about flowing change-sets. So when you are done on your side/private stream, you change your "flow-target" using the "Change Flow Target..." action in the pending changes view. Then you accept, resolve conflicts, then deliver your changes back to the main stream.
Jean-Michel Lemieux
Jazz Source Control Team