I can't seem to get the right combination with the following scenario:
1) I only have read access to the repository.
2) I want to create a diff that will contain the new files along with
diffs against the modified ones to email to the maintainer.
I tried 'cvs diff -c -N', but new files are ignored. Also, the included
diff.exe crashes with the -N switch, and patch.exe is totally screwed and
keeps saying it requires MS windows to run when it's spawned from the
commandline !?!??
Using the GNU tools from cygwin-b20 instead, I can gen a diff with -N, and
testing it works against a current (unmodified) CVS snapshot, but how can I
do this from the UI??
Also, I have to add '-p 1' to the patch commandline and would prefer not to
need it. Is there anyway to gen a diff that wouldn't need it for patch
without editing the generated diff file directly?
the files in /thread.old and /thread are the same (current CVS snapshot).
/thread.new contains the modified and new files. Both diff.exe and
patch.exe are the cygwin-b20 ones.
C:\Projects\TclCvs\thread.new>diff -c -r -a -x CVS* -N ../thread.old . >
../thread/thread_diff04.txt
C:\Projects\TclCvs\thread>patch -p 1 -c -i thread_diff04.txt
patching file `generic/thread.h'
patching file `generic/threadCmd.c'
patching file `win/config.vc'
patching file `win/makefile.vc'
patching file `win/thread.rc'
some diff output from thread_diff04.txt:
diff -c -r -a -x CVS -N ../thread.old/generic/thread.h ./generic/thread.h
*** ../thread.old/generic/thread.h Wed Dec 31 14:00:00 1969
--- ./generic/thread.h Wed Apr 05 11:45:14 2000
***************
*** 0 ****
--- 1,5 ----
+ /* RCS: @(#) $Id:$ */
+
+ #define THREAD_MAJOR_VERSION 2
+ #define THREAD_MINOR_VERSION 0
+ #define THREAD_VERSION "2.0"
diff -c -r -a -x CVS -N ../thread.old/generic/threadCmd.c
./generic/threadCmd.c
*** ../thread.old/generic/threadCmd.c Wed Jan 19 12:57:23 2000
--- ./generic/threadCmd.c Wed Apr 05 15:44:13 2000
***************
*** 125,131 ****
EXTERN int ThreadObjCmd _ANSI_ARGS_((ClientData clientData,
Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
EXTERN int Thread_Create _ANSI_ARGS_((Tcl_Interp *interp,
! CONST char *script));
[....]
--
* David Gravereaux *
Tomahawk Software Group
If knowlege is power, how come the more I learn, the more I realize how much I don't
know?
That isn't very empowering.
