CVSROOT: /cvs Module name: src Changes by: jo...@cvs.openbsd.org 2009/04/01 00:41:58
Modified files:
usr.bin/cvs : client.c remote.c
Log message:
in client mode, be sure to consider the file modified if a conflict
exists in the CVS/Entries file, otherwise the server has no way
of determining if the user has resolved it or not.
also in client mode, send a conflict as B"+=" not "+" alone, so other
cvs implementations get it.
commited entirely with opencvs,
with permission by deraadt@
