avoid delivering the whole changeset to some stream
Hello,
How can I prevent myself from delivering the whole changes of an already delivered changeset into stream A to stream B ?
I mean, let's imagine stream A represents a development environment and Stream B represents a productive environment.
Someone has collected a group of changes and delivered into a changeset to Stream A,
Now I want to accept those changes but only deliver some of them to stream B
How can I prevent myself from delivering the whole changes of an already delivered changeset into stream A to stream B ?
I mean, let's imagine stream A represents a development environment and Stream B represents a productive environment.
Someone has collected a group of changes and delivered into a changeset to Stream A,
Now I want to accept those changes but only deliver some of them to stream B
2 answers
One approach is to:
- create a workspace on stream B, and load it.
- change the flow target of the workspace to be stream A.
- in the Pending Changes view, in the Incoming Changes folder, right click on the change set, and select New->Patch
- change the flow target back to stream B
- select Project -> Apply_Patch
- In the Pending Changes view, remove the changes from the patch that you do not want.
- right click on the Patch, and select "auto-resolve"
- review the changes, and then check them in.
- deliver the resulting change set to stream B.
- create a workspace on stream B, and load it.
- change the flow target of the workspace to be stream A.
- in the Pending Changes view, in the Incoming Changes folder, right click on the change set, and select New->Patch
- change the flow target back to stream B
- select Project -> Apply_Patch
- In the Pending Changes view, remove the changes from the patch that you do not want.
- right click on the Patch, and select "auto-resolve"
- review the changes, and then check them in.
- deliver the resulting change set to stream B.
Comments
OK Geoffrey, I've managed with another approach.
- having the two current "my repository workspaces" bounded to each stream and with no pending changes
- I compare with... each other
- I see changes only in A workspace and changes only in B workspace
- I create new patch from the desired changeset
- I apply the patch to the current workspace
- Once conflicts resolved and accept the desired changes I create a new changeset and finaly delivers it to the stream
The pros and cons:
- I manage to mantain the two streams separately
- I start accumulating a bunch of different changesets between stream A and B
what do you think about it?
- having the two current "my repository workspaces" bounded to each stream and with no pending changes
- I compare with... each other
- I see changes only in A workspace and changes only in B workspace
- I create new patch from the desired changeset
- I apply the patch to the current workspace
- Once conflicts resolved and accept the desired changes I create a new changeset and finaly delivers it to the stream
The pros and cons:
- I manage to mantain the two streams separately
- I start accumulating a bunch of different changesets between stream A and B
what do you think about it?