Date: Wed, 21 Nov 2012 11:04:33 +0000 From: Tom Evans <tevans.uk@googlemail.com> To: Frank Seltzer <frank_s@bellsouth.net> Cc: "Sergey V. Dyatko" <sergey.dyatko@gmail.com>, freebsd-stable@freebsd.org Subject: Re: Node conflicts in SVN Message-ID: <CAFHbX1%2Bz_j119qNa5FnAXf1pCjhPcyQwz-AAeiSwE0ZHvpU4Lg@mail.gmail.com> In-Reply-To: <alpine.BSF.2.00.1211210322330.1612@Ace.nina.org> References: <alpine.BSF.2.00.1211191121340.1612@Ace.nina.org> <CAN6yY1uvrOELCtYG%2BaeBa8QZHPPjjtx4wVO8iOiHX87SSDErQA@mail.gmail.com> <alpine.BSF.2.00.1211191425390.1612@Ace.nina.org> <20121120092708.501e3f3a@laptop> <alpine.BSF.2.00.1211210322330.1612@Ace.nina.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Nov 21, 2012 at 8:44 AM, Frank Seltzer <frank_s@bellsouth.net> wrote: > Following that with 'grep -A1 C\ stat' shows 217 lines similar to these: > > D C accessibility > > local unversioned, incoming add upon update This says that svn has an entry for a file/directory named 'accessibility', but that a file/directory named 'accessibility' already exists on disk, and did not come from a svn checkout - ie, 'accessibility' is in /usr/ports/.svn/entries, but there is no /usr/ports/accessibility/.svn . When you do an 'svn up' now, there is a conflict - an unversioned resource is in the way of checking out a versioned resource, and the unversioned one should be deleted, so this is why it says "D" and "C". Something has trashed your ports tree, re-check it out. You were pretty adamant that you didn't check out ports over an existing tree, which would explain this, I wonder what else it could be. Do you (or did you) run portsnap? I wonder if that could trash a working copy like this. Cheers Tom
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFHbX1%2Bz_j119qNa5FnAXf1pCjhPcyQwz-AAeiSwE0ZHvpU4Lg>