From owner-freebsd-questions@FreeBSD.ORG  Thu Sep 27 15:05:31 2012
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 46C5E1065679
	for <freebsd-questions@freebsd.org>;
	Thu, 27 Sep 2012 15:05:31 +0000 (UTC)
	(envelope-from edflecko@gmail.com)
Received: from mail-oa0-f54.google.com (mail-oa0-f54.google.com
	[209.85.219.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 086998FC0A
	for <freebsd-questions@freebsd.org>;
	Thu, 27 Sep 2012 15:05:29 +0000 (UTC)
Received: by oagn9 with SMTP id n9so613970oag.13
	for <freebsd-questions@freebsd.org>;
	Thu, 27 Sep 2012 08:05:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=mime-version:date:message-id:subject:from:to:content-type;
	bh=338tzjfs/iXK1gO+1fKjZJEazIp2CHV+K+Horsz9KSk=;
	b=fjO00JTKP7q6DolBNtXYI72uCbl7gq/Pple+9Ri3v3GGiYCFT3PqJBhuaa3yofgGVF
	9TD4CPt1dqlG1QBjQhQj5yiP2AUEhhnge43yz3AcH9dUcnjTtS77M10B8fXRIpipCL3C
	kr94duZ5sijMYf+Z8jlpKwAgjLDbU6SD8dPP+lNBAcPtmzs774e9cqW4w1FfzBohtNch
	3MhpxqGAIJMlMu6T1pQ7EA3jGxz4jksmengTcnTNNZ7aYflQ0H6+WyuEFjaPgoYtxDN3
	/CrYye6w4X+PwRARpUa1f9Fbe3OGvatjgNu3dgX+RPUanpYNc+9/nDzT7B0cH+x4Dqyo
	gX9Q==
MIME-Version: 1.0
Received: by 10.60.169.75 with SMTP id ac11mr3399388oec.12.1348758329636; Thu,
	27 Sep 2012 08:05:29 -0700 (PDT)
Received: by 10.76.83.1 with HTTP; Thu, 27 Sep 2012 08:05:29 -0700 (PDT)
Date: Thu, 27 Sep 2012 08:05:29 -0700
Message-ID: <CAFS4T6Y97ptJ_rTx0hiibFYWHajRh3Gm24tN_jLdpZVPyGWj2A@mail.gmail.com>
From: Ed Flecko <edflecko@gmail.com>
To: freebsd-questions@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
Subject: Subversion output: Node remains in conflict ???
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Sep 2012 15:05:31 -0000

When I ran the following command using subversion, here's what I get:

fbsd# svn up /usr/src
Updating '.':
Skipped 'lib' -- Node remains in conflict
Skipped 'sys' -- Node remains in conflict
At revision 240997.
Summary of conflicts:
  Skipped paths: 2

fbsd# svn up /usr/ports
Skipped '/usr/ports'
Summary of conflicts:
  Skipped paths: 1

fbsd# cd /usr/ports

fbsd# make fetchindex
/usr/ports/INDEX-9.bz2                        100% of 1623 kB 4569 kBps

fbsd# pkg_version -l '<'
subversion                          <

fbsd#

Can someone tell me what "Node remains in conflict" means and how to I
correct this...or do I need to worry about it at all???

Thank you!

Ed