2014-07-17 22:14 GMT+02:00 Stefan Wollny <stefan.wol...@web.de>: > Hi there, > > a cvs-update of /etc/ports on i386-current quits at the letter D: > > ~ $ dmesg | grep OpenBSD > OpenBSD 5.6-beta (GENERIC.MP) #247: Wed Jul 16 22:09:54 MDT 2014 > > > ------------8< --------------- > ? devel/p5-MooseX-Role-WithOverloading > ? devel/p5-MooseX-SemiAffordanceAccessor > ? devel/p5-MooseX-Traits > ? devel/p5-MooseX-Traits-Pluggable > RCS file: /cvs/ports/INDEX,v > retrieving revision 1.427 > retrieving revision 1.428 > Merging differences between 1.427 and 1.428 into INDEX > rcsmerge: warning: conflicts during merge > cvs server: conflicts found in INDEX > C INDEX
It looks like you called "make index" at some point in the past. Just remove that file and then "cvs up INDEX" to get a clean version. -- WBR, Vadim Zhukov
