This is the mail archive of the cygwin@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

CVS DIFF? with cvs 1.11 under cygwin 1.1.9


Hello All,

I am learning how to use CVS and as part of this process I set up a test 
repository to 'play' with.  I can then try out various CVS operations on 
test data and become comfortable with CVS before moving on to REAL 
source.  I am having a problem with a certain 'cvs diff' operation.   My 
test repository contains a trunk with several revisions and two branches.

    |
    |        (branch_1)
    |
  trunk_1 -->branch_1_1
    |           |
    |           |
  trunk_2    branch_1_2
    |
    |
  trunk_3
    |        (branch_2)
    |
  trunk_4 -->branch_2_1
    |           |
    |           |
  trunk_5    branch_2_2
    |           |
    |           |
  trunk_6    branch_2_3
    |
    |
  trunk_7


There are two branches, branch_1 and branch_2.  The other names are tags 
applied to committed builds of the test software.  If I 'cvs checkout -r 
branch_1 module' I can say 'cvs diff -r branch_2' and get a list of file 
diffs.  However if I want to compare a branch build with the latest trunk 
build I have to either 'cvs checkout -r branch_1 module' followed by 'cvs 
diff -r trunk_7' OR 'cvs checkout module' followed by 'cvs diff -r 
branch_2'.  Doing a 'cvs checkout -r branch_1 module' followed by 'cvs diff 
-r HEAD' does not produce the same results.  Should 'cvs diff' compare by 
default with the latest trunk release? It doesn't.  If you check out a 
branch then do a update -j however is does correctly update the files that 
I know have changed.  Is there a way to checkout a branch build, and then 
diff it with the 'latest' trunk build without having to know the tag of the 
latest trunk release?  Following is cygcheck output. Thanks in advance for 
any help.

 > cd .
 > cygcheck -s -v -r -h


D:\src\working\epurse\cvstest>cygcheck -s -v -r -h

Cygnus Win95/NT Configuration Diagnostics
Current System Time: Wed Mar 14 09:39:50 2001

Win9X Ver 4.10 build 67766446  A

Path:	/cygdrive/c/NOVELL/CLIENT32
	/cygdrive/c/WINDOWS
	/cygdrive/c/WINDOWS/COMMAND
	/usr/bin
	/cygdrive/c/JJMACKAY/MET_TALK
	/cygdrive/c/JJMACKAY/UTILITY

SysDir: C:\WINDOWS\SYSTEM
WinDir: C:\WINDOWS

Here's some environment variables that may affect cygwin:

Here's the rest of your environment variables:
!C: = `C:\cygwin\home\johndoucette'
!D: = `D:\src\working\epurse\cvstest'
TMP = `/cygdrive/c/WINDOWS/TEMP'
TEMP = `/cygdrive/c/WINDOWS/TEMP'
PROMPT = `$p$g'
WINBOOTDIR = `C:\WINDOWS'
COMSPEC = `C:\WINDOWS\COMMAND.COM'
LOGNAME = `JohnDoucette'
GEMPLUS_LIB_PATH = `C:\WINDOWS\GEMPLUS'
CVSROOT = `/cygdrive/d/cvstest'
WINDIR = `C:\WINDOWS'
NWLANGUAGE = `ENGLISH'
WINDOWS_LOGIN = `0'
CMDLINE = `cygcheck -s -v -r -h'
TERM = `cygwin'
TZ = `AST4ADT3,M4.1.0/2,M10.5.0/2'

Scanning registry for keys with `Cygnus' in them...
HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\MenuOrder\Start 
Menu\&Programs\Cygnus Solutions
   (default) = (unsupported type)
HKEY_CURRENT_USER\Software\Cygnus Solutions
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\mounts v2
   (default) = `/cygdrive'
   cygdrive flags = 0x00000022
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\mounts v2\/
   (default) = `C:/cygwin'
   flags = 0x00000002
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\mounts v2\/usr/bin
   (default) = `C:/cygwin/bin'
   flags = 0x00000002
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\mounts v2\/usr/lib
   (default) = `C:/cygwin/lib'
   flags = 0x00000002
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\Program Options
HKEY_LOCAL_MACHINE\Software\Cygnus Solutions
HKEY_LOCAL_MACHINE\Software\Cygnus Solutions\Cygwin
HKEY_LOCAL_MACHINE\Software\Cygnus Solutions\Cygwin\mounts v2
HKEY_LOCAL_MACHINE\Software\Cygnus Solutions\Cygwin\Program Options

Listing available drives...
Drv Type        Size   Free Flags              Name
a:  fd           N/A    N/A
c:  hd  FAT32   4994Mb  26% CP    UN           DRIVE_C
d:  hd  FAT32  14521Mb  26% CP    UN           DRIVE_D
e:  fd           N/A    N/A
g:  cd  OS2    14745Mb  82% CP                 USR
h:  net OS2    14745Mb  82% CP                 USR
i:  net OS2    14745Mb  82% CP                 USR
j:  net OS2    14745Mb  82% CP                 USR
fd=floppy, hd=hard drive, cd=CD-ROM, net=Network Share
CP=Case Preserving, CS=Case Sensitive, UN=Unicode
PA=Persistent ACLS, FC=File Compression, VC=Volume Compression

Mount entries: these map POSIX directories to your NT drives.
-NT-  -POSIX-  -Type-  -Flags-
C:\cygwin\bin  /usr/bin  user    binmode
C:\cygwin\lib  /usr/lib  user    binmode
C:\cygwin  /        user    binmode

Looking to see where common programs can be found, if at all...
Found: C:\cygwin\bin\bash.exe
Found: C:\cygwin\bin\cat.exe
Found: C:\cygwin\bin\cpp.exe
Found: c:\WINDOWS\COMMAND\find.exe
Found: C:\cygwin\bin\find.exe
Warning: c:\WINDOWS\COMMAND\find.exe hides C:\cygwin\bin\find.exe
Found: C:\cygwin\bin\gcc.exe
Found: C:\cygwin\bin\gdb.exe
Found: C:\cygwin\bin\ld.exe
Found: C:\cygwin\bin\ls.exe
Found: C:\cygwin\bin\make.exe
Found: C:\cygwin\bin\sh.exe

Looking for various Cygnus DLLs...  (-v gives version info)
    56k 2000/12/03 C:\cygwin\bin\cygbz21.0.dll - os=4.0 img=1.0 sys=4.0
                   "cygbz21.0.dll" v0.0 ts=2000/11/20 19:53
   390k 2000/12/05 C:\cygwin\bin\cygtcl80.dll - os=4.0 img=1.0 sys=4.0
                   "cygtcl80.dll" v0.0 ts=2000/11/25 21:39
     5k 2000/12/05 C:\cygwin\bin\cygtclpip80.dll - os=4.0 img=1.0 sys=4.0
    10k 2000/12/05 C:\cygwin\bin\cygtclreg80.dll - os=4.0 img=1.0 sys=4.0
                   "cygtclreg80.dll" v0.0 ts=2000/11/25 21:39
    81k 2000/12/05 C:\cygwin\bin\cygitcl30.dll - os=4.0 img=1.0 sys=4.0
                   "cygitcl30.dll" v0.0 ts=2000/11/25 21:43
    35k 2000/12/05 C:\cygwin\bin\cygitk30.dll - os=4.0 img=1.0 sys=4.0
                   "cygitk30.dll" v0.0 ts=2000/11/25 21:43
   623k 2000/12/05 C:\cygwin\bin\cygtk80.dll - os=4.0 img=1.0 sys=4.0
                   "cygtk80.dll" v0.0 ts=2000/11/25 21:43
    18k 2000/10/23 C:\cygwin\bin\cyggdbm.dll - os=4.0 img=1.0 sys=4.0
                   "cyggdbm.dll" v0.0 ts=2000/10/22 23:26
    14k 2000/10/23 C:\cygwin\bin\cygintl.dll - os=4.0 img=1.0 sys=4.0
                   "cygintl.dll" v0.0 ts=2000/10/23 16:02
    45k 2000/10/22 C:\cygwin\bin\cygjbig1.dll - os=4.0 img=1.0 sys=4.0
                   "cygjbig1.dll" v0.0 ts=2000/10/22 20:06
   119k 2000/10/23 C:\cygwin\bin\cygjpeg6b.dll - os=4.0 img=1.0 sys=4.0
                   "cygjpeg6b.dll" v0.0 ts=2000/10/22 21:58
   163k 2001/02/03 C:\cygwin\bin\cygpng2.dll - os=4.0 img=1.0 sys=4.0
                   "cygpng2.dll" v0.0 ts=2001/2/3 17:21
    82k 2001/01/21 C:\cygwin\bin\cygform5.dll - os=4.0 img=1.0 sys=4.0
                   "cygform5.dll" v0.0 ts=2001/1/21 16:39
    53k 2001/01/21 C:\cygwin\bin\cygmenu5.dll - os=4.0 img=1.0 sys=4.0
                   "cygmenu5.dll" v0.0 ts=2001/1/21 16:39
   414k 2001/01/21 C:\cygwin\bin\cygncurses++5.dll - os=4.0 img=1.0 sys=4.0
                   "cygncurses++5.dll" v0.0 ts=2001/1/21 16:40
   299k 2001/01/21 C:\cygwin\bin\cygncurses5.dll - os=4.0 img=1.0 sys=4.0
                   "cygncurses5.dll" v0.0 ts=2001/1/21 16:38
    34k 2001/01/21 C:\cygwin\bin\cygpanel5.dll - os=4.0 img=1.0 sys=4.0
                   "cygpanel5.dll" v0.0 ts=2001/1/21 16:38
    17k 2001/01/07 C:\cygwin\bin\cyghistory4.dll - os=4.0 img=1.0 sys=4.0
                   "cyghistory4.dll" v0.0 ts=2001/1/7 0:34
   108k 2001/01/07 C:\cygwin\bin\cygreadline4.dll - os=4.0 img=1.0 sys=4.0
                   "cygreadline4.dll" v0.0 ts=2001/1/7 0:34
   243k 2000/10/23 C:\cygwin\bin\cygtiff3.dll - os=4.0 img=1.0 sys=4.0
                   "cygtiff3.dll" v0.0 ts=2000/10/22 22:14
    41k 2000/11/20 C:\cygwin\bin\cygXpm-noX4.dll - os=4.0 img=1.0 sys=4.0
                   "cygXpm-noX4.dll" v0.0 ts=2000/11/19 22:41
    45k 2000/11/20 C:\cygwin\bin\cygXpm-X4.dll - os=4.0 img=1.0 sys=4.0
                   "cygXpm-X4.dll" v0.0 ts=2000/11/19 22:45
    49k 2001/02/03 C:\cygwin\bin\cygz.dll - os=4.0 img=1.0 sys=4.0
                   "cygz.dll" v0.0 ts=2001/2/3 16:35
   615k 2001/01/31 C:\cygwin\bin\cygwin1.dll - os=4.0 img=1.0 sys=4.0
                   "cygwin1.dll" v0.0 ts=2001/1/31 11:08
     Cygwin DLL version info:
         dll major: 1001
         dll minor: 8
         dll epoch: 19
         dll bad signal mask: 19005
         dll old termios: 5
         dll malloc env: 28
         api major: 0
         api minor: 34
         shared data: 3
         dll identifier: cygwin1
         mount registry: 2
         cygnus registry name: Cygnus Solutions
         cygwin registry name: Cygwin
         program options name: Program Options
         cygwin mount registry name: mounts v2
         cygdrive flags: cygdrive flags
         cygdrive prefix: cygdrive prefix
         cygdrive default prefix:
         build date: Wed Jan 31 10:08:38 EST 2001
         shared id: cygwin1S3

===================================
John Daniel Doucette, Sr. Software Designer

J. J. MacKay Canada Limited
Halifax R & D Office
1046 Barrington Street, 1st Floor
Halifax, Nova Scotia
Canada
B3H 2R1

Phone		902.423.7727  x222
Fax		902.422.8108
Web		www . jjmackay . ca
Email		john . doucette @ jjmackay . ca
===================================


--
Want to unsubscribe from this list?
Check out: http://cygwin.com/ml/#unsubscribe-simple


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]