From owner-freebsd-stable@FreeBSD.ORG Wed Nov 21 11:04:41 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BE7511F8 for ; Wed, 21 Nov 2012 11:04:41 +0000 (UTC) (envelope-from tevans.uk@googlemail.com) Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 670F38FC0C for ; Wed, 21 Nov 2012 11:04:40 +0000 (UTC) Received: by mail-qc0-f182.google.com with SMTP id k19so5907109qcs.13 for ; Wed, 21 Nov 2012 03:04:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Ldluro+RLO46FJXWxe9x1BcJyF2cdSwPlcYBv3txRdA=; b=v97GDtYcbphior2yfJPHLk3N9FsjS46rO5lmYLPPn+m2Dxi2EvHtbdKbD1AryKYFm7 oof3Uzm8KmLUm6+K2WJxRLJl4TMNJPm/iAcuHzBmLhceJ2UzEIQvP6vi471x116AN0uI k9961oWddolAB68FZZhV/DJ8NxowFlWFi3b9M+jrXsRlZS5+AkT+TEzMX68R80IZFMWt GO/aDuPXEx6d39QtqPPB61SohMrSLYD8uzrNebhVx919GIkA9KsbWEMAxLyRHdy61gQp jIwoLTjiHKKCOMhSBMjchTY/ycF+syli/gMrXVeq5E56se3N+/BWlvqGBzrF/9PsOnwo /7eA== MIME-Version: 1.0 Received: by 10.224.188.13 with SMTP id cy13mr17630250qab.42.1353495873669; Wed, 21 Nov 2012 03:04:33 -0800 (PST) Received: by 10.49.127.49 with HTTP; Wed, 21 Nov 2012 03:04:33 -0800 (PST) In-Reply-To: References: <20121120092708.501e3f3a@laptop> Date: Wed, 21 Nov 2012 11:04:33 +0000 Message-ID: Subject: Re: Node conflicts in SVN From: Tom Evans To: Frank Seltzer Content-Type: text/plain; charset=UTF-8 Cc: "Sergey V. Dyatko" , freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2012 11:04:42 -0000 On Wed, Nov 21, 2012 at 8:44 AM, Frank Seltzer 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