[Svnmerge] svk:merge conflicts

[Daniel Rall]

On Sat, 14 Apr 2007, Perrin Harkins wrote:

> I'm trying to use svnmerge.py for the first time, and getting some
> property conflicts.  I followed the instructions for merging a branch
> into the trunk, and it worked perfectly except for this error:
> 
> Trying to change property 'svk:merge' from
> '1e2de8b2-7918-0410-bf86-ecb804a3b00d:/local/arcos/trunk:4631
> 3dec49c4-d2f5-0310-be96-f323038d42f2:/trunk:4654
> 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/arcos/trunk:23626' to
> '1e2de8b2-7918-0410-bf86-ecb804a3b00d:/local/arcos/trunk:4631
> 3dec49c4-d2f5-0310-be96-f323038d42f2:/trunk:4654
> 4f93d326-6d19-0410-844d-e685f9679d2f:/trunk:7684
> 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/arcos-6:27933
> 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/arcos/trunk:25980',
> but property already exists with value
> '10549753-5feb-4f4b-83d4-04f87d4b0a0d:/local/arcos_trunk:21870
> 1e2de8b2-7918-0410-bf86-ecb804a3b00d:/local/arcos/trunk:4631
> 3dec49c4-d2f5-0310-be96-f323038d42f2:/trunk:4654
> 4f93d326-6d19-0410-844d-e685f9679d2f:/branches/6.0:7648
> 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/arcos/trunk:28210'.
> 
> One of my co-workers does use svk, although he hasn't merged this code before.
> 
> Does this ring a bell for anyone?  Are there known problems with using
> svk and svnmerge.py on the same repository?

Subversion isn't doing intelligent merging of the property value,
which is different across your branches.  This is resulting in a
property conflict, which must be handled via manual resolution.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070416/a56cee12/attachment-0002.pgp>