merge problem: <file> has unresolved forks

I hope this is the right forum for this. I'm using rtc version 1.0.1 and am trying to keep a largish branch in synch with a parallel stream. I'm getting the following error trying to get this week's changes:

Failed to accept incoming baseline in component X from Y
Reason: Implementation restriction - "/X/file.sh" has unresolved forks; incoming change sets may not contain unresolved forks.

I can't find any reference to fork in any online help. The history of "file.sh" looks fairly straightforward. Is there anything I should be looking for? Any help will be greatly appreciated.

Thanks,

Girard Chandler

Hi Girard

Right place for RTC, but that is a curious error message. Are you using the Jazz SCM or Subversion/CVS?

anthony

Right place for RTC, but that is a curious error message. Are you using the Jazz SCM or Subversion/CVS?
anthony

It was suggested elsewhere that some of my many duplicate workspaces were a problem. After deleting 5 (!) of them, the problem went away. I don't know if that was the exact cure, but I'm happy now. I'm using the SCM version.

-Girard

I would have said that it looks like you ran into an instance of defect
79712, but you indicated the problem went away when you deleted some
workspaces, which isn't something I'd expect with defect 79712 (we'll
need someone from the Jazz SCM team to comment on that).

Note that the expected time to get this error is when you are accepting
multiple change sets that generate more than one conflict for the same
file (which Jazz SCM cannot yet handle). But apparently there are
currently cases where even if there is only one conflict in a given
file, you can still get this error message.

Cheers,
Geoff


girardc wrote:

I hope this is the right forum for this. I'm using rtc version 1.0.1
and am trying to keep a largish branch in synch with a parallel
stream. I'm getting the following error trying to get this week's
changes:

Failed to accept incoming baseline in component X from
Y
Reason: Implementation restriction - "/X/file.sh" has
unresolved forks; incoming change sets may not contain unresolved
forks.

I can't find any reference to fork in any online help. The history of
"file.sh" looks fairly straightforward. Is there anything I
should be looking for? Any help will be greatly appreciated.

Thanks,

Girard Chandler