On Tue, 2003-03-11 at 03:36, Max Bowsher wrote: > Robert Collins wrote: > > On Mon, 2003-03-10 at 22:04, Max Bowsher wrote: > >>>> NB: I have verified this will NOT introduce \r characters into the > >>>> files. > >>> > >>> MM, it would be easier for you to use patch -l :]. > >> > >> 1) patch won't be involved in the process at all > > > > Huh? Then I've misunderstood. > > cvs import > cvs up -j -j > cvs commit > > Yes, OK I *could* do it less directly, and involve patch. But if I do, I'd > still be inclined to accept the whitespace from the upstream zlib.
Huh, I didn't know you could import once the module existed. Wonders never cease etc. etc. Ok, go ahead. > >> 2) I think gratuitous whitespace changes from upstream sources are > >> bad > > > > I don't. Unless we stop keeping it in our CVS, we have ownership of > > that source once we depend on it. Whitespace changes are easily > > ignored by > > diff and patch utilities... thus not impacting merging changes from > > upstream. > > But surely unneccessary changes which cause more work when merging are bad? Depends on the payoff. In this case, IIRC, zlib wasn't building, or was generating *large* spurious diffs. > And whitespace changes really are unneccessary! Usually :}. Rob -- GPG key available at: <http://users.bigpond.net.au/robertc/keys.txt>.
signature.asc
Description: This is a digitally signed message part