From owner-freebsd-stable@FreeBSD.ORG Mon Nov 19 18:47:10 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 CF30ED8A for ; Mon, 19 Nov 2012 18:47:10 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id 52B438FC14 for ; Mon, 19 Nov 2012 18:47:10 +0000 (UTC) Received: by mail-ea0-f182.google.com with SMTP id a14so707807eaa.13 for ; Mon, 19 Nov 2012 10:47:09 -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=YDGxVoFJLRASMX3oLCjSeXQCklGxuovc1oBUEMa4EzY=; b=ObMYNIoLXGMBz5KaD5FNO2GL3MWgPEZ1bx84weoFHWASY/xwtrnG+TMEkoHAPnjfHk SuWIX2noSSHxfYNxDokMfq2iAwuzi+XRNT0dptW2uXo9eIP/59Z/2A4dQLPTI1eFrRGo AtQMVnURrP8hZQ5kj2PyzqGSI8HXGqzJKE7czIiPIfyYAl4xTpkKnn/usJYcQ47UFc+0 WGY/pHmRXTvZvlo8CGE6DYqa3j6MvSctOhj+pUNUNUKPV/gP4AFnqr1gCYJxD4o3cLrm 9Od0+gFg/rhUS23fBq3+O+huPIG0YQY7vOxBKvmjyRBS0hLdqrfXkvzr4ACuJgS10Sli QaUA== MIME-Version: 1.0 Received: by 10.14.176.68 with SMTP id a44mr26738383eem.1.1353350829164; Mon, 19 Nov 2012 10:47:09 -0800 (PST) Received: by 10.223.71.199 with HTTP; Mon, 19 Nov 2012 10:47:09 -0800 (PST) In-Reply-To: References: Date: Mon, 19 Nov 2012 10:47:09 -0800 Message-ID: Subject: Re: Node conflicts in SVN From: Kevin Oberman To: Frank Seltzer Content-Type: text/plain; charset=UTF-8 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: Mon, 19 Nov 2012 18:47:11 -0000 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