[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Wed, 11 Jul 2001 14:53:26 -0700
>Originator: Chuck Rossi
>Synopsis: cvs diff broken with certain diff flags
RedHat Linux 6.1 2.2.12-20 diff v2.7
System: Linux milan 2.2.12-20 #1 Mon Sep 27 10:40:35 EDT 1999 i686 unknown
/usr/bin/cvs diff --side-by-side --width=183 --expand-tabs
cvs server: invalid option -- y
Usage: cvs server [-lNR] [rcsdiff-options]
[[-r rev1 | -D date1] [-r rev2 | -D date2]] [files...]
-l Local directory only, not recursive
-R Process directories recursively.
-D d1 Diff revision for date against working file.
-D d2 Diff rev1/date1 against date2.
-N include diffs for added and removed files.
-r rev1 Diff revision for rev1 against working file.
-r rev2 Diff rev1/date1 against rev2.
--ifdef=arg Output diffs in ifdef format.
(consult the documentation for your diff program for rcsdiff-options.
The most popular is -c for context diffs but there are many more).
(Specify the --help global option for a list of other help options)
run 'cvs diff --side-by-side'
It occurs to me as I write this, that this might be because
our CVS server is running 1.10.7 and the client is `1.11.1p1.
If this is the case, it should at least be documented somewhere.