cvs is a pain!

Luke Kenneth Casson Leighton lkcl at
Mon Oct 19 17:25:48 GMT 1998

> 	It was an asked-for change:  methinks you can turn it
> 	off with an option...

not an obvious one (cvs --help update)
> 	The problem it addresses is as follows: two developers are
> 	working on the same problem, but don't know it.  They arrive
> 	at different corrections, and add them to the sources. One
> 	correction is in function a(), one in b().

the same problem applies if two developers fix the same problem in
different files.  the request for this "feature" cannot fix that problem.
where does it end? all changes treated as conflicts?

*annoyed* (but not at you, dave).

More information about the samba-technical mailing list