From owner-freebsd-stable@FreeBSD.ORG  Tue Nov 20 04:12:40 2012
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
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 AB87F86C
 for <freebsd-stable@freebsd.org>; Tue, 20 Nov 2012 04:12:40 +0000 (UTC)
 (envelope-from frank_s@bellsouth.net)
Received: from fmailhost05.isp.att.net (fmailhost05.isp.att.net
 [207.115.11.55])
 by mx1.freebsd.org (Postfix) with ESMTP id 882528FC08
 for <freebsd-stable@freebsd.org>; Tue, 20 Nov 2012 04:12:40 +0000 (UTC)
Received: from ace.nina.org (adsl-98-70-38-239.gnv.bellsouth.net[98.70.38.239])
 by isp.att.net (frfwmhc05) with SMTP
 id <20121120041234H05008ql9he>; Tue, 20 Nov 2012 04:12:34 +0000
X-Originating-IP: [98.70.38.239]
Date: Mon, 19 Nov 2012 23:12:33 -0500 (EST)
From: Frank Seltzer <frank_s@bellsouth.net>
X-X-Sender: frank_s@Ace.nina.org
To: Eitan Adler <lists@eitanadler.com>
Subject: Re: Node conflicts in SVN
In-Reply-To: <CAF6rxgnNqDdxKZ9RA+QKqHKOjB8V5OCBYKPmmW6wgYoF5KUnvA@mail.gmail.com>
Message-ID: <alpine.BSF.2.00.1211192310490.1612@Ace.nina.org>
References: <alpine.BSF.2.00.1211191121340.1612@Ace.nina.org>
 <CAN6yY1uvrOELCtYG+aeBa8QZHPPjjtx4wVO8iOiHX87SSDErQA@mail.gmail.com>
 <alpine.BSF.2.00.1211191425390.1612@Ace.nina.org>
 <CAN6yY1v2dh2TDod-h0-_ikBThMMeB74nVvt9=nUY34_p2UciGg@mail.gmail.com>
 <alpine.BSF.2.00.1211192106030.1612@Ace.nina.org>
 <CAF6rxgnNqDdxKZ9RA+QKqHKOjB8V5OCBYKPmmW6wgYoF5KUnvA@mail.gmail.com>
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 <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Nov 2012 04:12:40 -0000



On Mon, 19 Nov 2012, Eitan Adler wrote:

>> 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".

No, svn created the directory.  I moved /usr/ports out of the way and ran 
'svn co'.

> -- 
> Eitan Adler