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

2003-12-01 Thread Jim.Hyslop
Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: -Original Message- From: Jim.Hyslop [EMAIL PROTECTED] Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: ???. my cvs reference doesn't explain the -wb or -i options to cvs diff. care to elaborate? Have you tried cvs --help diff?

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

2003-12-01 Thread Todd Denniston
Robert P. J. Day wrote: -Original Message- From: Jim.Hyslop [EMAIL PROTECTED] Sent: Nov 28, 2003 9:50 AM To: [EMAIL PROTECTED] Subject: RE: how can I see what changes a cvs update would merge Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: ???. my cvs reference doesn't

how can I see what changes a cvs update would merge

2003-11-28 Thread Urs Thuermann
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? urs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

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

2003-11-28 Thread Gagneet Singh
|To: [EMAIL PROTECTED] |Subject: how can I see what changes a cvs update would merge | | |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? | |urs | | |___ |Info-cvs mailing

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

2003-11-28 Thread Robert P. J. Day
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

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

2003-11-28 Thread Gagneet Singh
PROTECTED] |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

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

2003-11-28 Thread Jim.Hyslop
Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: 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

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

2003-11-28 Thread Jim.Hyslop
Urs Thuermann [mailto:[EMAIL PROTECTED] 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? cvs di -rHEAD Note that this will work whether you are working on a branch or on the trunk - diff (and *only*

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

2003-11-28 Thread Jim.Hyslop
Gagneet Singh [mailto:[EMAIL PROTECTED] wrote: 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

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

2003-11-28 Thread Robert P. J. Day
-Original Message- From: Gagneet Singh [EMAIL PROTECTED] Sent: Nov 28, 2003 9:35 AM To: 'Robert P. J. Day' [EMAIL PROTECTED], 'Urs Thuermann' [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: RE: how can I see what changes a cvs update would merge cvs diff -wb -i File1.dsp

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

2003-11-28 Thread Jim.Hyslop
Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: ???. my cvs reference doesn't explain the -wb or -i options to cvs diff. care to elaborate? Have you tried cvs --help diff? -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. (http://www.leitch.com) Columnist, C/C++

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

2003-11-28 Thread Robert P. J. Day
-Original Message- From: Jim.Hyslop [EMAIL PROTECTED] Sent: Nov 28, 2003 9:50 AM To: [EMAIL PROTECTED] Subject: RE: how can I see what changes a cvs update would merge Robert P. J. Day [mailto:[EMAIL PROTECTED] wrote: ???. my cvs reference doesn't explain the -wb or -i options