Versioned items causing obstructions in SVN

Question

I'm using the VisualSVN server, with TortoiseSVN and AnkhSVN in Visual Studio.

I have a Trunk to which some devs on other teams are commiting various small changes on a regular basis.

I have a Branch on which a fairly major new development is being built. As a regular weekly routine I've been merging the Trunk into this Branch. All seems to be going ok.

I've come to do another such Merge from Trunk into this Branch and I'm getting truck loads of:-

The last merge operation tried to add the directory 'nameoffolder', but it was already added locally.

However these are folders that are versioned and have been in the Trunk and Branch for quite some time.

I get a similar thing with files:-

The last merge operation tried to add the file 'QueueCleanUp.ashx', but it was obstructed in the working copy.

This seems to be widespread accross the whole branch, the vast majority are not to do with anything that the Branch team are working on.

Anyone seen this before? How can I resolve this lot without masses of work?

Answer 1

In AnkhSVN there's a way to update with the allow unversioned obstructions check on. To do this open View -> Pending Changes, from here select the Update dropdown, and select Update to specific revision.... In the dialog that comes up, make sure Latest Revision is selected and check Allow Unversioned Obstructions.

I'm sure there's a similar option in TortoiseSvn, but I don't have that installed myself, so I can't check.

The commandline equivalent is the --force switch to the update command:

svn update --force c:\myproject