Cannot reintegrate into a working copy that has local modifications

All,

I have created a branch (branchProject) from trunk (trunkProject) that I
now want to reintegrate with trunk. The obvoius way to do would be the
following:

>cd /my/trunkProject
>svn update
>svn merge --reintegrate http://my.server/branches/branchProject

BUT all I get is a message from svn saying
>svn: Cannot reintegrate into a working copy that has local modifications

I tried svn update, svn cleanup, svn checkout on trunkProject (...and on
branchProject just in case...), so yes trunkProject does not have any
local modifications.
Any suggestions what is wrong here?

I have two suspects.
-The branchProject was created when the server svn version was 1.4.0
-I have a svn:special property, accidentally set on the root folder,
since I have a soft link to a dependency in my project.

client version:1.6.3
server version: 1.6.6

SOLUTION:
While writing this email I got rid of the svn:special property, which I
believe is impossible via Subclipse 1.6.2 by the way, and tadaa! It
worked! So By this email I hope I can help someone else that are as
confused by the "Cannot reintegrate into a working copy that has local
modifications" message as I was. Oh, the way of getting rid of the
svn:special was by
>svn propdel svn:special

Regards
Martin

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-10 08:54:26 CET