Jazz Forum Welcome to the Jazz Community Forum Connect and collaborate with IBM Engineering experts and users

cc sync reporting 'doMerge' exception

Hi

Any ideas on how the following can be resolved (the sync was working fine but at somepoint during today it broke)?


Synchronization exception: Could not: doMerge for location: Workspace|URI:itemOid/com.ibm.team.scm.Workspace/_7k4wQB3EEd2HOen15rOWBg
Caused by: Only one baseline per component may be specified
Caused by: Only one baseline per component may be specified

0 votes



One answer

Permanent link
This is defect 55501 (I just subscribed you to this defect).
Let's discuss it there.

BTW, what version of Team Concert are you currently using, and did you
recently upgrade (and if so, from what previous version)?

Unfortunately, the only workaround I found was to create a new
sync-stream for that ClearCase stream, and re-import the projects I
needed from ClearCase.

Note: If you have any changes to those projects in the Jazz repository
that haven't yet been sync'ed back to ClearCase, that's OK, just do the
following:
- create the new sync stream.
- import the projects from ClearCase into the new sync stream.
- change the flow-target of the merge workspace of the new sync stream
to be the old sync stream
- accept all changes from the old sync stream into the new merge
workspace("auto-resolve" should handle most, if not all, of the conflicts).
- change the flow-target of the new merge workspace back to be the new
sync stream
- deliver all changes from the new merge workspace to the new sync stream
- do a sync

Cheers,
Geoff

marko wrote:
Hi

Any ideas on how the following can be resolved (the sync was working
fine but at somepoint during today it broke)?


Synchronization exception: Could not: doMerge for
location:
Workspace|URI:itemOid/com.ibm.team.scm.Workspace/_7k4wQB3EEd2HOen15rOWBg
Caused by: Only one baseline per component may be
specified
Caused by: Only one baseline per component may be
specified

0 votes

Your answer

Register or log in 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.

Search context
Follow this question

By Email: 

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers
Answers and Comments
Question details

Question asked: May 14 '08, 12:32 p.m.

Question was seen: 7,183 times

Last updated: May 14 '08, 12:32 p.m.

Confirmation Cancel Confirm