From owner-freebsd-stable@FreeBSD.ORG Wed Nov 21 10:42:16 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 599C5B3E for ; Wed, 21 Nov 2012 10:42:16 +0000 (UTC) (envelope-from ronald-freebsd8@klop.yi.org) Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.78]) by mx1.freebsd.org (Postfix) with ESMTP id CDD9F8FC13 for ; Wed, 21 Nov 2012 10:42:15 +0000 (UTC) Received: from smtp.greenhost.nl ([213.108.104.138]) by smarthost1.greenhost.nl with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Tb7ky-00079A-CT; Wed, 21 Nov 2012 11:42:13 +0100 Received: from [81.21.138.17] (helo=ronaldradial.versatec.local) by smtp.greenhost.nl with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Tb7kx-0004I8-W0; Wed, 21 Nov 2012 11:42:11 +0100 Content-Type: text/plain; charset=us-ascii; format=flowed; delsp=yes To: "Sergey V. Dyatko" , "Frank Seltzer" Subject: Re: Node conflicts in SVN References: <20121120092708.501e3f3a@laptop> Date: Wed, 21 Nov 2012 11:42:13 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Ronald Klop" Message-ID: In-Reply-To: User-Agent: Opera Mail/12.11 (Win32) X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: 0.0 X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_50 autolearn=disabled version=3.2.5 X-Scan-Signature: 6c56b5a68734eff3bb82063186e8a5cf Cc: 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 10:42:16 -0000 On Wed, 21 Nov 2012 09:44:22 +0100, Frank Seltzer wrote: > > > On Tue, 20 Nov 2012, Sergey V. Dyatko wrote: > >> Can you run `svn status`? What does it show ? >> >> -- wbr, tiger > > 'svn status > stat' creates a 5.5 meg file mostly consisting of lines > like: > > D Mk/bsd.apache.mk > D Mk/bsd.autotools.mk > D Mk/bsd.cmake.mk > D Mk/bsd.commands.mk > D Mk/bsd.cran.mk > D Mk/bsd.database.mk > D Mk/bsd.destdir.mk > D Mk/bsd.drupal.mk > D Mk/bsd.efl.mk > > etc. I can forward this file to you if you would like to take a look at > it. > > Following that with 'grep -A1 C\ stat' shows 217 lines similar to these: > > D C accessibility > > local unversioned, incoming add upon update > -- > D C arabic > > local unversioned, incoming add upon update > -- > D C archivers > > local unversioned, incoming add upon update > -- > D C astro > > local unversioned, incoming add upon update > -- > D C audio > > local unversioned, incoming add upon update > > It's up to 27 now (see below). Again, this is on 3 separate boxes, none > running csup, cvsup or anything else but 'svn co'. > > Updating '.': > Skipped 'MOVED' -- Node remains in conflict > Skipped 'irc' -- Node remains in conflict > Skipped 'net-p2p' -- Node remains in conflict > Skipped 'games' -- Node remains in conflict > Skipped 'sysutils' -- Node remains in conflict > Skipped 'textproc' -- Node remains in conflict > Skipped 'net' -- Node remains in conflict > Skipped 'japanese' -- Node remains in conflict > Skipped 'databases' -- Node remains in conflict > Skipped 'graphics' -- Node remains in conflict > Skipped 'security' -- Node remains in conflict > Skipped 'x11-fm' -- Node remains in conflict > Skipped 'dns' -- Node remains in conflict > Skipped 'www' -- Node remains in conflict > Skipped 'archivers' -- Node remains in conflict > Skipped 'astro' -- Node remains in conflict > Skipped 'math' -- Node remains in conflict > Skipped 'devel' -- Node remains in conflict > Skipped 'audio' -- Node remains in conflict > Skipped 'Mk' -- Node remains in conflict > Skipped 'deskutils' -- Node remains in conflict > Skipped 'mail' -- Node remains in conflict > Skipped 'net-mgmt' -- Node remains in conflict > Skipped 'net-im' -- Node remains in conflict > Skipped 'multimedia' -- Node remains in conflict > Skipped 'finance' -- Node remains in conflict > Skipped 'ftp' -- Node remains in conflict > At revision 307611. > Summary of conflicts: > Skipped paths: 27 > > Frank http://svnbook.red-bean.com/en/1.2/svn.ref.svn.c.status.html 'D' Item is scheduled for Deletion. Your files are marked deleted at your host. And it complains that it gets an update from the server for a file which is deleted locally. Something f*cked up your ports tree. The solution for you is to remove /usr/ports and do a new checkout. Ronald.