From owner-freebsd-stable@FreeBSD.ORG Wed Nov 21 08:44:29 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 83E52645 for ; Wed, 21 Nov 2012 08:44:29 +0000 (UTC) (envelope-from frank_s@bellsouth.net) Received: from fmailhost04.isp.att.net (fmailhost04.isp.att.net [204.127.217.104]) by mx1.freebsd.org (Postfix) with ESMTP id 6384D8FC0C for ; Wed, 21 Nov 2012 08:44:29 +0000 (UTC) Received: from ace.nina.org (adsl-98-70-38-239.gnv.bellsouth.net[98.70.38.239]) by isp.att.net (frfwmhc04) with SMTP id <20121121084423H0400apfmje>; Wed, 21 Nov 2012 08:44:23 +0000 X-Originating-IP: [98.70.38.239] Date: Wed, 21 Nov 2012 03:44:22 -0500 (EST) From: Frank Seltzer X-X-Sender: frank_s@Ace.nina.org To: "Sergey V. Dyatko" Subject: Re: Node conflicts in SVN In-Reply-To: <20121120092708.501e3f3a@laptop> Message-ID: References: <20121120092708.501e3f3a@laptop> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed 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 08:44:29 -0000 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