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. >> 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? And whitespace changes really are unneccessary! Max.
