It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Follow this question
Question details

×42,787

question asked: May 19 '09, 7:51 p.m.
question was seen: 4,092 times
last updated: May 19 '09, 7:51 p.m.

Related questions

FAQ - How this Forum works

merge problem: <file> has unresolved forks

0
girard chandler (6●1●1) | asked May 19 '09, 7:51 p.m.
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

3 answers

Most liked answers ↑|Newest answers|Oldest answers

0
permanent link
Anthony Kesterton (7.5k●7●180●136) | answered May 20 '09, 10:46 a.m.
JAZZ DEVELOPER
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
0
permanent link
girard chandler (6●1●1) | answered May 20 '09, 11:45 a.m.

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
0
permanent link
Geoffrey Clemm (30.1k●3●30●35) | answered May 22 '09, 10:58 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
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

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.