Apple

laurent@Laurents-MacBook-Pro:~/Documents/Development/Personal/Mac OS X Projects/Test Project/Growl.framework> svn resolve --accept working
svn: warning: W155007: '/Users/laurent/Documents/Development/Personal/Mac OS X Projects/Test Project/Growl.framework' is not a working copy
svn: E155027: Failure occurred resolving one or more conflicts

Another thing I did notice yesterday is when I go to the Source Control menu in Xcode. I see my main project but I also see a working copy for Growl. I’m suspecting there are some remnants of a svn working copy in there but for the life of me, I can’t find where Xcode is taking this.

Anybody has any idea?

-Laurent.

Laurent Daudelin email@hidden

AIM/iChat/Skype:LaurentDaudelin http://www.nemesys-soft.com/

Logiciels Nemesys Software

On Oct 11, 2016, at 17:16, Rich Siegel <email@hidden> wrote:

On Tuesday, October 11, 2016, Laurent Daudelin <email@hidden> wrote:

Here is one of the warning I have:

/Users/laurent/Documents/Development/Personal/Mac OS X Projects/Project Test/Growl.framework/.svn/pristine/8f/8fd39bdaef5a22c1daee0d2622b727fdea3083f5.
svn-base

I have no idea where this is coming from.

I have seen Xcode put svn warnings in the sidebar when there are unresolved tree conflicts in the local working copy (or, more apropos, when Xcode *thinks* there are unresolved tree conflicts in the local working copy).

In the root of your working copy, try this:

   svn resolve --accept working

(Alternatively, "svn resolved" might do the job as well.)

R.
--
Rich Siegel                                 Bare Bones Software, Inc.
<email@hidden>                      <http://www.barebones.com/>

Someday I'll look back on all this and laugh... until they sedate me.

References:
	>Re: SVN Warnings in Xcode (From: Rich Siegel <email@hidden>)