On Fri, 9 Aug 2019 17:01:13 +0200, Stefan Wollny <stefan.wol...@web.de>
wrote:

> As I never did any changes to 'www/squid/Makefile' the following
> irritates me:
> 
> /usr/ports $ doas cvs -q up -Pd -A

don't use doas

> cvs server: conflict: INDEX is modified but no longer in the
> repository 
> C INDEX

rm INDEX

> M www/squid/Makefile

cvs diff www/squid/Makefile
if the change is useless, rm it and re run cvs up.

In doubt, rm the whole tree and fetch a new one ;)


Cheers,
Dnaiel

Reply via email to