info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: strange cvs diff problem with pcl-cvs and viewcvs


From: Mark D. Baushke
Subject: Re: strange cvs diff problem with pcl-cvs and viewcvs
Date: Tue, 27 Jul 2004 07:53:27 -0700

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dennis W. Bulgrien <address@hidden> writes:

> How can "cvs diff -r HEAD main.f" lines < and > be swapped that so that it
> doens't look like what it is now was changed to what it used to be:

'cvs up -p -rHEAD main.f | diff main.f -' will give you what you want.

Note that you may use 'cvs diff -rBASE -rHEAD main.f' will tell you the
difference between the baseline version and the top-of-branch in the
repository.

If main.f is locally modified, then 'cvs diff -rHEAD main.f' shows you how
should show you what would happen to the top-of-tree if you committed your
curent change presuming that your main.f was up-to-date. It is possible that
a 'cvs update' would cause conflict markers to be added to the file.

        Enjoy!
        -- Mark

> 
> < what it is now
> ---
> > what it used to be
> 
> But show what it used to be changed to what it is now:
> 
> < what it used to be
> ---
> > what it is now
> 
> "Frederic Brehm" <address@hidden> wrote in message
> news:address@hidden
> ...To
> see the differences between the local file and the head version you need to
> use the command "cvs diff -r HEAD main.f".
> ...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFBBmxn3x41pRYZE/gRAkW8AJ9f8qwc83YUsYxo36xVHoD5pdYtmQCg0nex
c+/ELyeXbE2jDbNcEpeGYBM=
=4ZAk
-----END PGP SIGNATURE-----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]