Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Apr 2017 08:53:25 +0200
From:      "Herbert J. Skuhra" <herbert@mailbox.org>
To:        freebsd-ports@freebsd.org
Subject:   Re: svn error: node conflict in /usr/ports/x11/xcb-proto/files
Message-ID:  <867f2d2asa.wl-herbert@mailbox.org>
In-Reply-To: <08.08.25473.FE8EAF85@dnvrco-omsmta03>
References:  <08.08.25473.FE8EAF85@dnvrco-omsmta03>

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



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