Re: CVS Diff Problem

[Derek Robert Price]

Prashant wrote:

>lawrence.jones@ugsplm.com (Larry Jones) wrote in message 
>news:<mailman.1988.1091068747.1960.bug-cvs@gnu.org>...
>  
>
>>Jim.Hyslop writes:
>>    
>>
>>>Only use 'cvs import' to import a third-party source tree. Don't use it to
>>>initially populate your repository of your own files.
>>>      
>>>
>>Why not?  That's the easiest way to get an existing source tree into CVS
>>regardless of whether it's third-party sources or your own.
>>
>>    
>>
>>>Did you just type in random CVS revisions, or are the revisions you
>>>mentioned here the actual revisions causing you problems? If they are the
>>>actual revisions, then even a 'cvs -nq up' will not show anything, because
>>>the other user checked in his/her changes on a different branch.
>>>      
>>>
>>Not so.  In this particular case (revisions 1.1.1.1 and 1.2), one
>>revision is on the vendor branch and the other is on the trunk.  Part of
>>the vendor branch magic is to automatically switch from the vendor
>>branch to the trunk as soon as something is committed to the trunk, so
>>'cvs -nq up' *will* show that an update is required in this case.
>>
>>-Larry Jones
>>
>>I wonder if you can refuse to inherit the world. -- Calvin
>>    
>>
>
>The thing is that I already know that it needs a patch/merge/update
>because doing a cvs status on it will tell me that.  Isn't there a
>setting or command to make it diff against the head of the trunk
>without specifying it everytime?
>  
>

No.  Diffing against BASE is the most common usage and thus the
default.  I suppose you could specify "diff -rHEAD" in your ~/.cvsrc,
but you would have to remember to run cvs with the global -f option when
you wanted to run diff in any other mode after that.

Derek

-- 
                *8^)

Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!