[ On Thursday, August 3, 2000 at 11:54:28 (-0400), Greg Hudson wrote: ]
> Subject: Re: lib/10739: crypto lib doesn't compile
>
> > How can I make cvs just do the merging that it does with `cvs
> > import' and then be able to hack the rest of the pieces into shape
> > before comitting the whole thing?
> 
> You can run "cvs admin -b1.1" on each file in the affected directory
> (unfortunately, "cvs admin" won't accept a numeric revision for
> multiple files) before each import (or after each import).  That will
> cause all files to be flagged as a conflicts on import.  This method
> is somewhat simpler than mrg's proposed "cvs ci -f" answer, and it has
> the additional benefit of being idempotent.

Both methods of course disable all benefit of "cvs import" and thus I
think that simply outlawing it and doing manual imports (using "cvs
add") on a ``normal'' branch is far superior since then it's much easier
to understand the history resulting from merges, etc.

-- 
							Greg A. Woods

+1 416 218-0098      VE3TCP      <gwoods@acm.org>      <robohack!woods>
Planix, Inc. <woods@planix.com>; Secrets of the Weird <woods@weird.com>