From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Larmour To: Fabrice Gautier Cc: "Ecos-List \(E-mail\)" Subject: Re: [ECOS] ecos cvs server bug?? Date: Fri, 15 Sep 2000 11:59:00 -0000 Message-id: <39C271A7.BD7E345@redhat.com> References: <8AE4B526B977D411841F00A0CC334020052C57@cuz-exchange.sdesigns.net> X-SW-Source: 2000-09/msg00254.html Fabrice Gautier wrote: > It seems there is a bug in the cvs server used by ecos. > When I want to diff recursively some directories, the filenames in the diff > output doesn't include the subdirectories name (and that make the output > unsuitable for patches). [snip] > Does eCos ( or all Redhat) cvs server is older than 1.10.3 ? It appears so. > As I suspect the cvs server is not only for eCos, can anybody at Redhat > forward this to the cvs administrator ? I'll pass it on. > I'm surprised that nobody ever noticed this problem, or am I the only one > who is trying to doing patches ??? It only affects recursive diffs. There has been a long-standing practice at Cygnus/Red Hat to use the attached FixPatch script when generating patches made from "cvs diff"s. To be honest, I didn't know the problem had been fixed for that reason! Jifl -- Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS Tel: +44 (1223) 728762 "Plan to be spontaneous tomorrow." || These opinions are all my own fault #! /usr/bin/perl -wi # From: Jason Merrill # Date: 07 Dec 1997 01:29:36 -0800 # # When I do a cvs diff, I always pass the output through this script, which # copies the filename from the Index line into the patch itself. while (<>) { if (/^Index: (.*)/) { $full = $1; print; for (1..7) { $_ = <>; s/^--- [^\t]+\t/--- $full\t/; s/^\+\+\+ [^\t]+\t/\+\+\+ $full\t/; print; } } else { print; } }