svn conflict

[Ryan Schmidt]

On Oct 18, 2014, at 12:33 PM, Craig Treleaven wrote:
> 
>> Yes, you should fix the case of the directory. Since you have a case-insensitive filesystem, you'll need to do the move in the repository, rather than in your working copy:
>> 
>> https://subversion.apache.org/faq.html#case-change
> 
> In case anyone else is following along at home...
> 
> I did the move on the repository but still had a conflict as svn locally believed the directory had the old name.  So I deleted sysutils/MacPorts-daemondo locally and checked-out a new copy from the server.  All seems well, now.

That'll work. Or following the update instructions in the Subversion FAQ item linked to above should work too.