Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Sep 2012 08:05:29 -0700
From:      Ed Flecko <edflecko@gmail.com>
To:        freebsd-questions@freebsd.org
Subject:   Subversion output: Node remains in conflict ???
Message-ID:  <CAFS4T6Y97ptJ_rTx0hiibFYWHajRh3Gm24tN_jLdpZVPyGWj2A@mail.gmail.com>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFS4T6Y97ptJ_rTx0hiibFYWHajRh3Gm24tN_jLdpZVPyGWj2A>