[Svnmerge] svk:merge conflicts
dlr at collab.net
Mon Apr 16 12:49:41 PDT 2007
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
> 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/arcos/trunk:23626' to
> but property already exists with value
> 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
Size: 189 bytes
Desc: not available
More information about the Svnmerge