It's all about the answers!

Ask a question

Issue accepting change sets from flow target


Brian Rodecap (5183) | asked Dec 18 '09, 1:17 p.m.
I am working on a project under RTC 1.0 with two streams, S1 and S2, and need to flow change sets from S1 into S2.

Using the "Change Explorer" view in the IDE, I have been able to accept several of the change sets into S2 but not all. Attempting to accept any of the remaining change sets results in a message saying, "The repository workspace you are accepting this change set into doesn't have all the change sets that led up to this change set."

There are no other pending changes from any contributors in either S1 or S2. Why would I be getting this message? Thanks,
Brian

2 answers



permanent link
Geoffrey Clemm (30.1k33035) | answered Dec 18 '09, 3:08 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
In S1, suppose there are two change sets that have modified file
foo.java: CS-23 and CS-35. You have requested CS-35, but not CS-23.
But the state of file foo.java in CS-35 contains the changes from CS-23
... so you can't get CS-35 unless you also have CS-23 (i.e. "the change
set that led up to this change set").

But of course it would be much friendlier if the system told you what
those needed change sets are ... please feel free to add your support to
work item 102139 if you'd like to see this functionality added.

Cheers,
Geoff


brodecap wrote:
I am working on a project under RTC 1.0 with two streams, S1 and S2,
and need to flow change sets from S1 into S2.

Using the "Change Explorer" view in the IDE, I have been
able to accept several of the change sets into S2 but not all.
Attempting to accept any of the remaining change sets results in a
message saying, "The repository workspace you are accepting this
change set into doesn't have all the change sets that led up to this
change set."

There are no other pending changes from any contributors in either S1
or S2. Why would I be getting this message? Thanks,
Brian

permanent link
Andrew Hoo (1.0k1) | answered Dec 21 '09, 11:38 a.m.
JAZZ DEVELOPER
The way you describe flowing changes from S1 to S2 using the Change
Explorer might be giving you some grief. When I integrate changes between
two streams, I use a Repository Workspace (initially with the same
configuration as S2) as a middle-step between. (You must be using a
repository workspace in between as well... I don't believe it is possible
for you to accept directly into a stream from the change explorer).
- I change my flow target to S1. From the pending changes view (not the
change explorer), I accept changes from S1. This will let me accept
conflicts (if there are any), as well as give me a better idea of all the
incoming changes that might lead up to a desired changeset.
- If you expand changeset nodes and select a file in the pending changes
view, the pending changes view will highlight other changesets that modify
the same file, so you know that only accepting the top-most one would be
creating a gap.
- When I've accepted all the changes in the repository workspace, I verify
it compiles and I resolve conflicts. Then I change the flow target back to
S2 and deliver them.

On Fri, 18 Dec 2009 13:22:59 -0500, brodecap
<brian> wrote:

I am working on a project under RTC 1.0 with two streams, S1 and S2,
and need to flow change sets from S1 into S2.

Using the "Change Explorer" view in the IDE, I have been
able to accept several of the change sets into S2 but not all.
Attempting to accept any of the remaining change sets results in a
message saying, "The repository workspace you are accepting this
change set into doesn't have all the change sets that led up to this
change set."

There are no other pending changes from any contributors in either S1
or S2. Why would I be getting this message? Thanks,
Brian



--

Your answer


Register or to post your answer.


Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.