Confused about merge...

So, I have two streams; StreamA and StreamB.

I am wanting to deliver all changes delivered to StreamA to StreamB, so what I did was the following:

1) Created repo workspace from StreamB
2) Changed Flow Target to StreamA
3) Accepted all incoming baselines and changesets (required a little merging on a couple of files)
4) Changed flow target back to StreamB

I see all my outgoing changesets and baselines as I would expect.

BUT I am also seeing a bunch of INCOMING baselines. Why?

Hi Scott

Someone changed Stream B could be the reason you have Incoming changes?? (Sorry - it is late here in London :-). Seriously though - check what the incoming changes are, and who delivered them.

I would start with a repo workspace based on StreamA and then change its flow target to StreamB. To me - this make more sense in terms of what you are trying to achieve - deliver StreamA changes to StreamB.

anthony

No changes have been delivered, there are just baselines that existed prior to when I created the repo workspace.

So, I have two streams; StreamA and StreamB.

I am wanting to deliver all changes delivered to StreamA to StreamB, so what I did was the following:

1) Created repo workspace from StreamB
2) Changed Flow Target to StreamA
3) Accepted all incoming baselines and changesets (required a little merging on a couple of files)
4) Changed flow target back to StreamB

I see all my outgoing changesets and baselines as I would expect.

BUT I am also seeing a bunch of INCOMING baselines. Why?

Hi Scott

Someone changed Stream B could be the reason you have Incoming changes?? (Sorry - it is late here in London :-). Seriously though - check what the incoming changes are, and who delivered them.

I would start with a repo workspace based on StreamA and then change its flow target to StreamB. To me - this make more sense in terms of what you are trying to achieve - deliver StreamA changes to StreamB.

anthony

The baselines may have been created after your original accept or they may not exist locally for other reasons (i.e. an accept from another stream may have accepted one or more baselines that have the same change sets as the other baselines). Regardless, your workspace will still have all the change sets you require and can be delivered to the stream in question.

One a side note, if you accept the baselines, you would probably see a couple of outgoing baselines that had the same change sets. The pending changes view shows the baselines but, in reality, they are not really relevant and we are working on ways to change the pending changes view so these baselines are not shown.

The incoming baselines I am seeing are months old, clearly pre-dating my workspace. So, how did my workspace no longer include them??

The baselines may have been created after your original accept or they may not exist locally for other reasons (i.e. an accept from another stream may have accepted one or more baselines that have the same change sets as the other baselines). Regardless, your workspace will still have all the change sets you require and can be delivered to the stream in question.

One a side note, if you accept the baselines, you would probably see a couple of outgoing baselines that had the same change sets. The pending changes view shows the baselines but, in reality, they are not really relevant and we are working on ways to change the pending changes view so these baselines are not shown.

I was trying to do a merge from stream A to stream B as suggested in other thread. This is what i did

1. create workspace on stream A which as component A
2. Modified the file compA/test.java
3. checked in the file and delivered
4. verfied the history and it shows the changeset

Now i want to deliver the same changes set to stream B. so here is what i did
1. changed the flow target from pending change view of stream A workspace to Stream B
2. as soon as i changed the flow target i see incomming changeset in steam A workspace which i used above
3. I went ahead and accepted all the incomming changes
4. changed the flowtarget from stream B to stream A

a)My question is did i did the right thing ?
b)How can i verify that once i changed the stream flow and accepted all the changes means it was delivered to stream B

It confused me a lot can someone please clarify.

Accepting is IN, Delivery is OUT.

So, what you want to do is, change your work flow, then find the changes sets you want to deliver to StreamB and deliver them. To be clear, they will be out going change sets.

I was trying to do a merge from stream A to stream B as suggested in other thread. This is what i did

1. create workspace on stream A which as component A
2. Modified the file compA/test.java
3. checked in the file and delivered
4. verfied the history and it shows the changeset

Now i want to deliver the same changes set to stream B. so here is what i did
1. changed the flow target from pending change view of stream A workspace to Stream B
2. as soon as i changed the flow target i see incomming changeset in steam A workspace which i used above
3. I went ahead and accepted all the incomming changes
4. changed the flowtarget from stream B to stream A

a)My question is did i did the right thing ?
b)How can i verify that once i changed the stream flow and accepted all the changes means it was delivered to stream B

It confused me a lot can someone please clarify.

This looks familiar. This is also answered in this thread:

https://jazz.net/forums/viewtopic.php?t=18249

Mehul meant "Outgoing Changes" where he says "Incoming Changes".

Scott, you are correct and I think Mehul posted to the wrong thread.

Accepting is IN, Delivery is OUT.

So, what you want to do is, change your work flow, then find the changes sets you want to deliver to StreamB and deliver them. To be clear, they will be out going change sets.

I was trying to do a merge from stream A to stream B as suggested in other thread. This is what i did

1. create workspace on stream A which as component A
2. Modified the file compA/test.java
3. checked in the file and delivered
4. verfied the history and it shows the changeset

Now i want to deliver the same changes set to stream B. so here is what i did
1. changed the flow target from pending change view of stream A workspace to Stream B
2. as soon as i changed the flow target i see incomming changeset in steam A workspace which i used above
3. I went ahead and accepted all the incomming changes
4. changed the flowtarget from stream B to stream A

a)My question is did i did the right thing ?
b)How can i verify that once i changed the stream flow and accepted all the changes means it was delivered to stream B

It confused me a lot can someone please clarify.

*whew*

For the record my issue is unanswered.

This looks familiar. This is also answered in this thread:

https://jazz.net/forums/viewtopic.php?t=18249

Mehul meant "Outgoing Changes" where he says "Incoming Changes".

Scott, you are correct and I think Mehul posted to the wrong thread.

Accepting is IN, Delivery is OUT.

So, what you want to do is, change your work flow, then find the changes sets you want to deliver to StreamB and deliver them. To be clear, they will be out going change sets.

I was trying to do a merge from stream A to stream B as suggested in other thread. This is what i did

1. create workspace on stream A which as component A
2. Modified the file compA/test.java
3. checked in the file and delivered
4. verfied the history and it shows the changeset

Now i want to deliver the same changes set to stream B. so here is what i did
1. changed the flow target from pending change view of stream A workspace to Stream B
2. as soon as i changed the flow target i see incomming changeset in steam A workspace which i used above
3. I went ahead and accepted all the incomming changes
4. changed the flowtarget from stream B to stream A

a)My question is did i did the right thing ?
b)How can i verify that once i changed the stream flow and accepted all the changes means it was delivered to stream B

It confused me a lot can someone please clarify.

Hi Scott,

You are correct, again. Unfortunately, your issue is still open.

Personally, I have never seen this (using RTC for almost 2 years now). I can't seem to be able to reproduce what happened to you (sorry). I am also curious as to how "old baselines" are showing up in your workspace. I think Mike Valenta may have given the correct answer as to how to resolve them. But, I am not sure about accepting "Old" baselines after having newer ones already in your workspace. I would think doing that would probably bring your code "back in time". I don't think you want that to be the case.

-Walter

*whew*

For the record my issue is unanswered.

This looks familiar. This is also answered in this thread:

https://jazz.net/forums/viewtopic.php?t=18249

Mehul meant "Outgoing Changes" where he says "Incoming Changes".

Scott, you are correct and I think Mehul posted to the wrong thread.

Accepting is IN, Delivery is OUT.

So, what you want to do is, change your work flow, then find the changes sets you want to deliver to StreamB and deliver them. To be clear, they will be out going change sets.

I was trying to do a merge from stream A to stream B as suggested in other thread. This is what i did

1. create workspace on stream A which as component A
2. Modified the file compA/test.java
3. checked in the file and delivered
4. verfied the history and it shows the changeset

Now i want to deliver the same changes set to stream B. so here is what i did
1. changed the flow target from pending change view of stream A workspace to Stream B
2. as soon as i changed the flow target i see incomming changeset in steam A workspace which i used above
3. I went ahead and accepted all the incomming changes
4. changed the flowtarget from stream B to stream A

a)My question is did i did the right thing ?
b)How can i verify that once i changed the stream flow and accepted all the changes means it was delivered to stream B

It confused me a lot can someone please clarify.

:D :)

Yea, I have never seen it before either, but it is reproducable, and I had a co-worked reproduce it as well. To get past the merge I did deliver the outgoing changesets and baselines, and that cleared up all the incoming baselines (which all happen to be empty). Very odd eh?

If anyone (@IBM) wants to look at it I would be more than happy to share.

Hi Scott,

You are correct, again. Unfortunately, your issue is still open.

Personally, I have never seen this (using RTC for almost 2 years now). I can't seem to be able to reproduce what happened to you (sorry). I am also curious as to how "old baselines" are showing up in your workspace. I think Mike Valenta may have given the correct answer as to how to resolve them. But, I am not sure about accepting "Old" baselines after having newer ones already in your workspace. I would think doing that would probably bring your code "back in time". I don't think you want that to be the case.

-Walter

*whew*

For the record my issue is unanswered.

This looks familiar. This is also answered in this thread:

https://jazz.net/forums/viewtopic.php?t=18249

Mehul meant "Outgoing Changes" where he says "Incoming Changes".

Scott, you are correct and I think Mehul posted to the wrong thread.

Accepting is IN, Delivery is OUT.

So, what you want to do is, change your work flow, then find the changes sets you want to deliver to StreamB and deliver them. To be clear, they will be out going change sets.

I was trying to do a merge from stream A to stream B as suggested in other thread. This is what i did

1. create workspace on stream A which as component A
2. Modified the file compA/test.java
3. checked in the file and delivered
4. verfied the history and it shows the changeset

Now i want to deliver the same changes set to stream B. so here is what i did
1. changed the flow target from pending change view of stream A workspace to Stream B
2. as soon as i changed the flow target i see incomming changeset in steam A workspace which i used above
3. I went ahead and accepted all the incomming changes
4. changed the flowtarget from stream B to stream A

a)My question is did i did the right thing ?
b)How can i verify that once i changed the stream flow and accepted all the changes means it was delivered to stream B

It confused me a lot can someone please clarify.

:D :)