RE: how can I see what changes a cvs update would merge

[Gagneet Singh]

Hi!

Further to my previous mail, for the cvs command line you can use the
following command to get the status of the files which have changed. 

cvs -n update -P 

M File1.dsp

The above tells you that the file name 'File1.dsp' has been locally
modified. Now you can diff it with the previous version on the server
by:

cvs diff -wb -i File1.dsp 

And find out what has changed.

Hope this helps.

Gagneet


|-----Original Message-----
|From: address@hidden 
|[mailto:address@hidden On Behalf 
|Of Robert P. J. Day
|Sent: Friday, 28 November, 2003 16:09 PM
|To: Urs Thuermann
|Cc: address@hidden
|Subject: Re: how can I see what changes a cvs update would merge
|
|
|On 28 Nov 2003, Urs Thuermann wrote:
|
|> How can I see the changes that a call to cvs update would do to the 
|> working copy of my files, without actually applying the changes?
|
|this resembles something i (as a newbie) have been thinking 
|about recently
|-- what are all the ways i can just *query* with regards to a 
|CVS repository?  it's this querying that seems to get such 
|short shrift in the CVS documentation i've seen.
|
|certainly, there's variations like:
|
|  $ cvs log ...
|  $ dvs diff ...
|  $ cvs co -c
|
|and so on.  i think it would be immensely useful for beginners 
|like me to have a reference list/cheat sheet of all of these 
|kinds of options since, in a big way, beginners have a real 
|fear of committing or updating when they don't know what's 
|about to happen.
|
|so all the different ways to query an existing repository 
|would be a good 
|start.
|
|rday
|
|
|
|
|_______________________________________________
|Info-cvs mailing list
|address@hidden
|http://mail.gnu.org/mailman/listinfo/info-cvs
|