Soho Posted May 16, 2012 Report Share Posted May 16, 2012 I just tried to synchronize a simple change on /main and got this: The sync process was unable to replicate the following branch: Branch: /main Operation: Push Source repository: PSDK_CFC@SH_LAPTOP:8084 Destination repository: PSDK_CFC@192.168.1.62:8084 Error description: The source branch can't have multiple heads How did that problem occur and how do I fix it? Link to comment Share on other sites More sharing options...
cidico Posted May 16, 2012 Report Share Posted May 16, 2012 I had this problem too. It happened to me when I was using a branch that had a conflit. Not exactly a conflict, just this: I just did the merge with the bottom changeset and everything worked out. Link to comment Share on other sites More sharing options...
manu Posted May 17, 2012 Report Share Posted May 17, 2012 As cidico said you need to unify the branch heads, imagine cidico's branch explorer without the merge link, he would obtain the same error trying to replicate. Once the heads are unified (using the merge) the branch can be replicated. Link to comment Share on other sites More sharing options...
Soho Posted May 18, 2012 Author Report Share Posted May 18, 2012 I am afraid my case is more complicated. Take a look at these screen shots: This shot shows root changeset 0. Note two things. For once it is traversed by a changeset link from a later changeset. This is because changeset 0 is graphically out of place, because it was created much later than most changesets. The reason for that is that when you install a fresh Plastic server on, say a laptop, you are forced to create a workspace in order to start the gui. A strange design-flaw, since there is a lot of functionality in the gui that does not require a selected workspace, but that is another discussion. Anyway, I probably created the first repository I wanted to replicate and a workspace to start Plastic. This caused Plastic to create the "0" changeset root. Secondly two early changesets on two different heads have the root changeset as parent shown on the next screen shots: As seen above the parent link is in reverse and traverses all changesets between the new root and about 11 months of changesets. Anyway, my situation is that I don't know which changeset I should merge from in order to merge the two heads. If I try merging from changeset 0, Plastic crashes with "an error occurred processing your request" (a bug I suppose), but it wouldn't make much sense to merge with that changeset anyway. If I try merging from some of the changesets in the lower head, I don't get any changes to checkin. What do you suggest? Link to comment Share on other sites More sharing options...
manu Posted May 18, 2012 Report Share Posted May 18, 2012 I think I'll need to connect with you next week to get this issue solved. Can you tell me your available hours and your time zone? Link to comment Share on other sites More sharing options...
Soho Posted May 25, 2012 Author Report Share Posted May 25, 2012 Yes it looks like some support would be needed. My schedule is a bit tight at the moment, but I will contact you later if the problem persists. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.