Deliver error

Hi,

you probably have incoming changes that conflict with your outgoing changes. If that is the case you need to first accept the conflicting changes, potentially resolve merge conflicts and then you can upload the changes.

This sounds like Defect 14691, but that was supposed to have been fixed
in 3.0.1 (in particular, the fix was to automatically do the change
history restructuring).

Defect 14691 does describe some workarounds, so you could try those ...
but it would also be worth reporting as a defect, because this is
supposed to have been fixed.

Just to confirm, this error blocked your deliver, and wasn't just a
warning message, right?

Cheers,
Geoff


On 8/23/2011 9:53 AM, mezeigeza wrote:

Hi,

we use RTC 3.0. I have a repository workspace with lots of outgoing
changesets (no incoming). When I tried to deliver changes I have the
following error:

Problem
An error occurred during "Deliver".

Delivering changes for component 'allianz-buroffice' would create
conflicts in the stream. In order to remedy this, we need to
restructure your change history in such a way that it will produce
conflicts in your workspace.

What does this mean, what shall I do?

Regards
Gza

Hi,

Thanks for your answers. Geza is a colleague of mine, and he's a bit busy so I'll answer (we tried to understand what's going on together).

@Ralph: as Geza wrote, we didn't see any incoming change sets.

@Geoff: it looks like defect 14691 is exactly what's happening here. It was a blocking error, and unfortunately Geza moved on and tried the merge from the other way around (changing source and target streams), so we cannot try the workaround described in defect description, but if we encounter it again, we'll do.

We haven't upgraded yet to 3.0.1, but it's a good reason to speed things up a little bit (we tried a few weeks ago but ran into license problems, which I couldn't resolve so we had to roll back).

Best regards,
Attila

This sounds like Defect 14691, but that was supposed to have been fixed
in 3.0.1 (in particular, the fix was to automatically do the change
history restructuring).

Defect 14691 does describe some workarounds, so you could try those ...
but it would also be worth reporting as a defect, because this is
supposed to have been fixed.

Just to confirm, this error blocked your deliver, and wasn't just a
warning message, right?

Cheers,
Geoff


On 8/23/2011 9:53 AM, mezeigeza wrote:

Hi,

we use RTC 3.0. I have a repository workspace with lots of outgoing
changesets (no incoming). When I tried to deliver changes I have the
following error:

Problem
An error occurred during "Deliver".

Delivering changes for component 'allianz-buroffice' would create
conflicts in the stream. In order to remedy this, we need to
restructure your change history in such a way that it will produce
conflicts in your workspace.

What does this mean, what shall I do?

Regards
Gza