svn:mergeinfo conflicts

During merges, I'm seeing a lot of property conflicts like:

Trying to delete property 'svn:mergeinfo' with value
'/Crewsy/trunk/core/src/main/resources/com/proteomesoftware/massqc:6038-6994
/MassQC/trunk/core/src/main/resources/com/proteomesoftware/massqc:7388-7494'
but the local value is
'/Crewsy/trunk/core/src/main/resources/com/proteomesoftware/massqc:6038-6994
/MassQC/trunk/core/src/main/resources/com/proteomesoftware/massqc:7388-7494'.

which seems a bit odd. I'm seeing this with both 1.5.4 and 1.6.3 (I
tried upgrading).

Any suggestions?

I *think* what happened was something like this:

    svn cp svn://.../MassQC/trunk/ svn://.../MassQC/branches/1.2
... edits
in branch 1.2:
   svn merge svn://MassQC/trunk

in trunk:
   svn merge svn://MassQC/branches/1.2/specific_file

in branch 1.2:
   svn merge svn://MassQC/trunk/
<conflicts>

I realize now that the reverse merge was a mistake.

Is there a way to fix this? If I know for sure that merges are correct
through a certain rev, is there any easy way for me to "reset" the
mergeinfo properties?

Thanks,

-c

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2376465

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-29 10:48:26 CEST