From owner-freebsd-stable@FreeBSD.ORG Tue Nov 20 06:25:30 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 E3780D04 for ; Tue, 20 Nov 2012 06:25:30 +0000 (UTC) (envelope-from sergey.dyatko@gmail.com) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx1.freebsd.org (Postfix) with ESMTP id 5ADE88FC08 for ; Tue, 20 Nov 2012 06:25:29 +0000 (UTC) Received: by mail-lb0-f182.google.com with SMTP id go10so2719685lbb.13 for ; Mon, 19 Nov 2012 22:25:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; bh=Fe7w3VjKBxh+7YfPh47O6PEz7w2WDAGdJPVQHMiaTrs=; b=hHH5dNFGTt484KcDa7m6jD9Zfy9xKPZx9uc3J9j3txq9lm5mCgZOmg8rC98DqPVGc2 /IJbDztYWppUFr+hEAJ31RS8mRIfbBlps3+qtZ4roQykRxytO3usbFh/LMI2H6mbkr1/ XiXSD0vDI6r2H3iIBh1h9VeSKaGfb/kaXD/c/Qn8bkfY3+EOV8OREixwffUxK5gCxKs7 65I1aC6Kib1a5b3Yth3gQ5XjrZyiIo2SsyjKRlR7P4+mTtt/W7CZoNXQ11mXqcIdS3Sq aRRBN4xWrN2d5zMTPuSsH6WnxU55V9zsnoZBXJBo8awFagWITecFx1t8Mid00JZ3O03g l5Ew== Received: by 10.112.40.42 with SMTP id u10mr5944000lbk.124.1353392728799; Mon, 19 Nov 2012 22:25:28 -0800 (PST) Received: from laptop (m-s.agava.net. [195.222.84.203]) by mx.google.com with ESMTPS id t5sm4422711lbf.6.2012.11.19.22.25.27 (version=SSLv3 cipher=OTHER); Mon, 19 Nov 2012 22:25:27 -0800 (PST) Date: Tue, 20 Nov 2012 09:27:08 +0300 From: "Sergey V. Dyatko" To: freebsd-stable@freebsd.org Subject: Re: Node conflicts in SVN Message-ID: <20121120092708.501e3f3a@laptop> In-Reply-To: References: X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.6; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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: Tue, 20 Nov 2012 06:25:31 -0000 On Mon, 19 Nov 2012 14:37:00 -0500 (EST) Frank Seltzer wrote: > > > On Mon, 19 Nov 2012, Kevin Oberman wrote: > > > On Mon, Nov 19, 2012 at 8:28 AM, Frank Seltzer > > wrote: > >> I run a nightly ports tree update and I have been getting the > >> following errors the last couple of days. I haven't seen this > >> asked before so is this just me or is anyone else seeing this? > >> Have I fat-fingered something? > >> > >> Updating '/usr/ports': > >> Skipped '/usr/ports/astro' -- Node remains in conflict > >> Skipped '/usr/ports/devel' -- Node remains in conflict > >> Skipped '/usr/ports/sysutils' -- Node remains in conflict > >> Skipped '/usr/ports/audio' -- Node remains in conflict > >> Skipped '/usr/ports/textproc' -- Node remains in conflict > >> Skipped '/usr/ports/x11-fm' -- Node remains in conflict > >> Skipped '/usr/ports/MOVED' -- Node remains in conflict > >> Skipped '/usr/ports/games' -- Node remains in conflict > >> Skipped '/usr/ports/mail' -- Node remains in conflict > >> Skipped '/usr/ports/net' -- Node remains in conflict > >> Skipped '/usr/ports/multimedia' -- Node remains in conflict > >> At revision 307524. > >> Summary of conflicts: > >> Skipped paths: 11 > > > > This usually indicates non-SVN updates to these items. If you have > > not modified them intentionally, just 'rm -r' them and 'snv > > up /usr/ports' again. I hit this after switch to svn when a cron > > job did a csup of ports. Oops! > > -- > > R. Kevin Oberman, Network Engineer > > E-mail: kob6558@gmail.com > > Nope, no non-SVN updates or manual changes. I am getting this on 3 > separate boxes and have disabled csup in cron on them all. > Can you run `svn status`? What does it show ? > Are you sure about 'rm -r'ing them? IIRC, I reran 'svn co' instead > of 'svn up' by mistake on 1 box and it pulled the entire collection > again. Not sure about this as my memory ain't what it used to be. > You know what they say, The mind is the first thing to go! > > Thanks, > Frank -- wbr, tiger