Re: [Mldonkey-users] Can't compile cvs 2.02-11

[Christian Lange]

Hello luculus,

> Shouldn't cvs warn about files it can't merge successfully?

it does, by putting a 'C' in the status line where you normally get a
'P' or 'U'. The conflicting parts are marked by '>>>>>' in the source
to help finding them. If you want to overwrite local changes use '-C'
as parameter to the update command. I usually use

   cvs -q -z9 upd -dP

Note: The '-z9' doesn't do any harm, if the CVS server doesn't know
how to compress that much it uses a lower level. The '-q' reduses the
output to the status lines. '-d' creates new directories, '-P' deletes
empty directories. If you want to know more about update options use

   cvs -H upd

Hth

 - Christian Lange, Berlin