> > Given all that you've stated below, it seems that the crux 
> of your argument
> > turns on the ability of a file to be "mergable".  In my 
> unadorned, pooh-like
> > brain, I ask the simple (and rhetorical) question, "why?"  
> Why can't I have a
> > simple switch which tells CVS that for this file or this 
> directory or this
> > repository, I simply want to turn merging (and all CVS file 
> manipulations)
> > *off*.  Period.  Nothing more.
> 
> Well, if you just want to turn off merging completely then you have to
> come up with some way to tell CVS that you've done the merge manually
> and that there are no more conflicts so it's safe for "cvs commit" to
> procede.


Or, you could just use the patch for reserved checkouts:
http://www.cvshome.org/cyclic/cvs/dev-reserve.html

_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to