RE: Cvs diff with multiples files in multiples directories
-Original Message- From: Fabrice Gautier [mailto:[EMAIL PROTECTED]] cvs -q diff -u -r mypatch.txt You should read the Cederqvist manual. Try the command rdiff and you probably want to forget about the -u option (unidiff, which is not supported by old patch programs). Guus
Re: Cvs diff with multiples files in multiples directories
--- In [EMAIL PROTECTED], [EMAIL PROTECTED] (Guus Leeuw) wrote: -Original Message- From: Fabrice Gautier [mailto:gautier@e...] cvs -q diff -u -r mypatch.txt You should read the Cederqvist manual. Try the command rdiff and you probably want to forget about the -u option (unidiff, which is not supported by old patch programs). Well, I've read it quite a bitespecially where there was diff or rdiff mentionned. And rdiff always ask me for a module name and a revision number when I just want a diff between a file in my working directory and a the remote one it is based on. A bit of Cederqvist readings about rdiff: "Like the diff command, except it operates directly in the repository" Well, you got it... But anyway, the problem is a bug corrected in cvs 1.10.3 And reading Cederqvist didn't help to know why when you use a 1.10.5 client you still see the bug - the obvious answer I didn't figured out was that the bug is in the server, and Cderqvist doesn't give a clue about the diff being processed by the server (even on the working file) How and still another question I didn't see the answer in the Cederqvist is how I produce a patch with a new file (ie: a file present in the working copy but not the repository). May be it's another bug of the cvs server, but -N doesn't work. So If you have the page in the Cederqvist where there is an answer:- To be more general I don't think the Cederqvist handle the situation of people who have only read access to the repository (at least the free chapters). Thanks Fabrice
Cvs diff with multiples files in multiples directories
Hi, I'm working on a CVS source tree where I only have read-only access. So when I do some change I try to produce a patch that could be easily applied. I have a subtree that looks like kernel \---current \---src \---include And I have a modified source(kapi.cxx) and an include (kapi.h) file in src and include In the module directory I type: cvs -q diff -u -r mypatch.txt And the ouput is like this: Index: current/include/kapi.h === RCS file: /cvs/ecos/ecos/packages/kernel/current/include/kapi.h,v retrieving revision 1.9 diff -u -r1.9 kapi.h --- kapi.h 2000/08/25 17:33:31 1.9 +++ kapi.h 2000/09/15 00:42:19 @@ -186,6 +186,15 @@ [ diff output ... ] Index: current/src/common/kapi.cxx === RCS file: /cvs/ecos/ecos/packages/kernel/current/src/common/kapi.cxx,v retrieving revision 1.12 diff -u -r1.12 kapi.cxx --- kapi.cxx2000/08/25 17:33:31 1.12 +++ kapi.cxx2000/09/15 00:42:19 @@ -277,6 +277,10 @@ [ diff output ... ] This seems correct except this: --- kapi.cxx2000/08/25 17:33:31 1.12 +++ kapi.cxx2000/09/15 00:42:19 It should be the full name, like in the Index just above. When I try to apply the patch, it doesn't find the files and I have to type all the files names. I have seen other patchs where there was the full name. How can I have them the full name in the patch output ? I use cvs that came with wincvs (cvs.exe v.1.10.5) and I have the cygwin diff (v 2.7-cygwin-990830) and patch (v2.5). Thanks a lot. -- Fabrice Gautier
