svn error: node conflict in /usr/ports/x11/xcb-proto/files
Herbert J. Skuhra
herbert at mailbox.org
Sat Apr 22 06:51:28 UTC 2017
Thomas Mueller skrev:
>
> On this computer, I can't get /usr/ports/x11/xcb-proto/files:
> Skipped 'files' -- Node remains in conflict
> At revision 439134.
> Summary of conflicts:
> Skipped paths: 1
Have you tried 'svn revert -R .' in /usr/ports? Or a fresh checkout?
Have you tried svnlite from base?
> On other computer, this directory downloads successfully with svn.
>
> I even tried downloading with lynx and with w3m, but these text-mode
> browsers compress (gzip) the downloaded file, and I can't see how to
> avoid this. I used to be able to download with lynx, and downloaded
> file was the same as on the server; lynx would never compress it
> gratuitously.
>
> This is an old installation, needs to be updated when I can get to it after some other tasks.
>
> svn --version shows
> svn, version 1.8.8 (r1568071)
> compiled Mar 24 2014, 09:58:59 on amd64-portbld-freebsd11.0
>
> uname -a shows
>
> FreeBSD amelia2 11.0-CURRENT FreeBSD 11.0-CURRENT #1 r286653M: Wed
> Aug 12 15:25:51 UTC 2015
> root at amelia2:/usr/obj/usr/src/sys/SANDY11NC-NDIS amd64
You should really update world/kernel first and then update all your ports.
At least some ports will probably fail on this old system.
--
Herbert
More information about the freebsd-ports
mailing list