On 12 Oct 2000, Jean-Marc Lasgouttes wrote:
> >>>>> "Baruch" == Baruch Even <[EMAIL PROTECTED]> writes:
>
> Baruch> Nope he didn't. I've fixed it on my tree and now doing a
> Baruch> compilation. The mistake is a wrong resolution of conflicts
> Baruch> after your changes with relation to the display/screen stuff.
> Baruch> I've resolved it here locally as it should be, and will create
> Baruch> and post a patch soon enough.
>
> Hmm, so this means we should not rely too much on cvs when it merges
> conflicting changes?
Probably not, The problem here was that in the offending files I also
fixed a problem of LFCR->LF, this obviously caused cvs to go nuts and not
use a cool judgement regarding the changes. Hopefully for other things it
fares better. Mostly it does a good job, but not always.
--
Baruch Even
http://techst02.technion.ac.il/~sbaruch/ (My Site)
http://www.redrival.com/jindor/ (My brothers AD&D site)
" Learn to laugh ... it's the path to true love! "
- The Angel in the movie Michael
