Re: diff after update

2001-12-20 Thread Eric Siegerman
On Thu, Dec 20, 2001 at 02:56:56PM -0500, Matt Riechers wrote: > David Hugh-Jones wrote: > > How do I find out what the cvs update has changed, between my old uncommitted > > version, and the new version created by the update? > > If it merged repository changes with your local changes, diff .#fo

Re: diff after update

2001-12-20 Thread Matt Riechers
David Hugh-Jones wrote: > > sorry if this is an obvious question, but after doing a CVS update, how do I > diff files? > > Here's the scenario: > > I am working on a file. I haven't committed any changes. I do a general cvs > update. I notice that that file shows "M". > > How do I find out wha

Re: diff after update

2001-12-20 Thread Larry Jones
David Hugh-Jones writes: > > How do I find out what the cvs update has changed, between my old uncommitted > version, and the new version created by the update? The update will have saved your old uncommitted version as .#. (i.e., if your file was named foo.x and was at revision 1.1, it will be

diff after update

2001-12-20 Thread David Hugh-Jones
sorry if this is an obvious question, but after doing a CVS update, how do I diff files? Here's the scenario: I am working on a file. I haven't committed any changes. I do a general cvs update. I notice that that file shows "M". How do I find out what the cvs update has changed, between my o