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 .#foo.c.XXX foo.c
for an appropriate value of XXX (it's the revision number of the
file with which you had last synchronized, *before* the update
that created the .# file, i.e. the old value of -rBASE.)
> you can diff the
> previous revision against your local copy to see the recently merged changes and
> your uncommited changes. For example, if the new repository file rev is 1.2, and
> you were working on 1.1, do 'cvs diff -r1.1 foo.c' to see the merged changes
> with your local changes.
That gives something slightly different. As you say, it shows
both sets of changes together -- the 1.1->1.2 changes and the
user's uncommitted ones.
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. [EMAIL PROTECTED]
| | /
One ring to rule the mall.
- Movie review headline, eye Magazine
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
