Re: [Buzztard-devel] how to make diff

[Tommi S. U. <tui...@cc...>]

>> Hello. I have made the const modifications to the source tree and now I'm
>> wondering what would be the best way to produce a diff to cvs version?
>>
>> I was thinking that first I rename my current tree and then get latest cvs
>> and diff to that.
>
> ...or just use "cvs diff"

Actually I should have done a copy of the tree before I made modifications 
and I would diff to that. If I diff to cvs, there is possibly changes made 
to cvs that I don't have, thus the diff would reverse those changes.

Well, I'll just try the cvs diff and see if there is some changes that 
need to be manually removed.

Or how does it happen if I had cvs access? I took the cvs maybe a week ago 
and haven't updated it since. Does the cvs handle commits smart by 
detecting the version I had and diffing the changes to that version and 
then applying that diff to the latest version?

I mean if I take version 100 and modify it and commit it and meanwhile 
others have made commits so that version is 105 now. Does my commit 
override the 101-105 changes or should I do some 'get latest' and merge my 
changes there before committing?

Tommi