From owner-freebsd-stable@FreeBSD.ORG Tue Nov 20 02:47:08 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 CE734247 for ; Tue, 20 Nov 2012 02:47:08 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id 420478FC0C for ; Tue, 20 Nov 2012 02:47:07 +0000 (UTC) Received: by mail-la0-f54.google.com with SMTP id j13so5218578lah.13 for ; Mon, 19 Nov 2012 18:47:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=qETGDbbvvZALdge4ZSEubCLQ5Jv5o24Te22hEKDamwU=; b=kSNKtBP/Kf5GfjrdMu8bjEY8PFcHN8OPIfPsoJCfDqKO2E79J0JQie567ekyVNAr2W wiMLeVzjrHLld2uQgPM+ggHqd6N+IgtLenoAjoeWCDK5q0cLM/jEJ/hiATE7GSDstf55 ibNKxjBkoRr3sOtAOkr5Uif0IT/CtcLnlV7UA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:x-gm-message-state; bh=qETGDbbvvZALdge4ZSEubCLQ5Jv5o24Te22hEKDamwU=; b=kVLgSGGQdpZXu+H/4FVRNS82PZtbbbzKKGUaNeBuEpyIcwZarLRCNrI5wd8QNEuEJm 4J9izJZuZW+sAnjnuC4NHv1oeADnqXSkyeJqMedMceOso7z/wN8a8O+634jPINkziHVN xROE9wgVoOkU5pJLbStIS1ahThv9h/rt2DVzqfIdaOKOcNPyoOkAOweysnAglekLW4Fs hTXvPbyso+GaAtGHsizHf0t0pJWVjAc2hBaqsNEKg6Kt3qbihbadQ2SYqPcGLoKbaMOQ nnROlK9JKNthAxbzlAZebTNeZS1zk3g/o+2NRj2BxvmGNF6uVsPTfux2rakE91QlTadm +Pbg== Received: by 10.112.103.136 with SMTP id fw8mr5993567lbb.18.1353379626807; Mon, 19 Nov 2012 18:47:06 -0800 (PST) MIME-Version: 1.0 Received: by 10.112.25.166 with HTTP; Mon, 19 Nov 2012 18:46:36 -0800 (PST) In-Reply-To: References: From: Eitan Adler Date: Mon, 19 Nov 2012 21:46:36 -0500 Message-ID: Subject: Re: Node conflicts in SVN To: Frank Seltzer Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQl3SZuIV9VJZRtwBy6ZDCetYkqMDfGdZNluRtSjPOGcb0WpB8n9cNm1tFGWcJ+FBYqRzHfK 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: Tue, 20 Nov 2012 02:47:09 -0000 On 19 November 2012 21:43, Frank Seltzer wrote: > > > On Mon, 19 Nov 2012, Kevin Oberman wrote: > >> On Mon, Nov 19, 2012 at 11:37 AM, 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 > > > It's now up to 24. > > Updating '/usr/ports': > > Skipped '/usr/ports/mail' -- Node remains in conflict > Skipped '/usr/ports/net' -- Node remains in conflict > Skipped '/usr/ports/multimedia' -- Node remains in conflict > Skipped '/usr/ports/dns' -- Node remains in conflict > Skipped '/usr/ports/www' -- Node remains in conflict > > Skipped '/usr/ports/astro' -- Node remains in conflict > Skipped '/usr/ports/sysutils' -- Node remains in conflict > Skipped '/usr/ports/devel' -- Node remains in conflict > Skipped '/usr/ports/audio' -- Node remains in conflict > Skipped '/usr/ports/textproc' -- Node remains in conflict > Skipped '/usr/ports/japanese' -- Node remains in conflict > Skipped '/usr/ports/graphics' -- Node remains in conflict > Skipped '/usr/ports/security' -- Node remains in conflict > > Skipped '/usr/ports/x11-fm' -- Node remains in conflict > Skipped '/usr/ports/MOVED' -- Node remains in conflict > Skipped '/usr/ports/irc' -- Node remains in conflict > Skipped '/usr/ports/math' -- Node remains in conflict > > Skipped '/usr/ports/games' -- Node remains in conflict > Skipped '/usr/ports/archivers' -- Node remains in conflict > Skipped '/usr/ports/deskutils' -- Node remains in conflict > Skipped '/usr/ports/net-p2p' -- Node remains in conflict > Skipped '/usr/ports/databases' -- Node remains in conflict > Skipped '/usr/ports/net-mgmt' -- Node remains in conflict > Skipped '/usr/ports/net-im' -- Node remains in conflict > At revision 307575. > Summary of conflicts: > Skipped paths: 24 did you run svn checkout on a directory which wasn't controlled by svn (with stuff in it?). If so you need to remove those directories and run "svn up". -- Eitan Adler