Re: Your last fixincl.x checkin causes bootstrap failures

[Bruce Korb <bkorb at veritas dot com>]

-------- Original Message --------
Subject: failure notice
Date: 14 Apr 2003 20:16:44 -0000
From: MAILER-DAEMON at sources dot redhat dot com
To: bkorb at veritas dot com

Hi. This is the qmail-send program at sources.redhat.com.[[...]]

Loren James Rittle wrote:
> 
> >> Ah, I see what happened.  Putting dunce cap on: although I did not
> >> hand generate it, it may have been automatically updated without a
> >> merge conflict.
> 
> > That would be quite odd.  Your generated version had to have had
> > updated counts, too.
> 
> CVS merging looks per thunk.  If someone checked in a single fix, then
> I could have updated and seen a logical conflict only (which I didn't
> look for or fix).

I see.  That then actually argues in _favor_ of putting the generated
time stamps into this particular generated file.  This file shouldn't
ever really get merged.  You do the merge just to make CVS happy with
version currency and then regenerate.  It'll guarantee a conflict on
every merge.  A good thing (in this case)?

Cheers - Bruce