Subversion output: Node remains in conflict ???

Ed Flecko edflecko at gmail.com
Thu Sep 27 15:05:31 UTC 2012


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


More information about the freebsd-questions mailing list