[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: cvs command line usage
From: |
Jim Hyslop |
Subject: |
Re: cvs command line usage |
Date: |
Fri, 05 Aug 2011 10:41:53 -0400 |
User-agent: |
Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:5.0) Gecko/20110624 Thunderbird/5.0 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 11-08-05 10:16 AM, Jim Hyslop wrote:
> On 11-08-07 5:04 PM, J.V. wrote:
>> How do I show a list of files on my local machine that:
>
>> 1) files that do not exist in the repo 2) files that are modified
>> locally but have not been committed 3) files that are in the repo
>> but not on my local system 4) files that have been modified in the
>> repo but not (updated) on my local system
>
> cvs -nq update
>
> (1) will be indicated by '?' (2) will be indicated by 'M' (3) and
> (4) will be indicated by 'U'
For completeness, I should point out that merge conflicts will be
indicated by 'C'. And there is a fifth case you might want to consider:
files that have been modified both in the repository and locally. The
bad news is, CVS uses 'M' to indicate those files. The good news is, it
also prints out a few lines ahead of it:
RCS file: /path/to/file,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into file
M file
so you can write a script/batch file that will detect the "Merging
differences" line and emit a different message for 'file'.
If there would be a merge conflict, then CVS will emit a couple of
warnings, and the last line will read 'C file'.
I hope all this makes sense - I haven't had my morning coffee yet :)
BTW, you might want to check your computer's time - according to my mail
reader, your message originates two days in the future :D
- --
Jim Hyslop
Dreampossible: Better software. Simply. http://www.dreampossible.ca
Consulting * Mentoring * Training in
C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk48ATEACgkQLdDyDwyJw+NXdACg8bRdd8bGPKXGIRM+uXS+XWy2
VtkAoOdr8W2FrvwgCO04w3lT/g1ffUjn
=TgAu
-----END PGP SIGNATURE-----