On Wed, Oct 8, 2008 at 4:32 PM, Matthias Kilian <[EMAIL PROTECTED]> wrote:
> On Wed, Oct 08, 2008 at 10:08:03PM +0200, Otto Moerbeek wrote:
>> > > Is CVSWEB broken?
>> >
>> > No, that's just the way CVS keywords work: the expansion is done at
>> > *checkout* and not at commit. This can be seen using the -ko option
>> > to "cvs up" or "cvs co" to disable the expansion done at checkout
>> > time. Just trust what you see on the revision listing and ignore the
>> > keywords in the diff output.
>> >
>> > (Beware: the -k option is normally 'sticky', so if you use -ko you
>> > should either combine it with -p to just send the output to stdout (in
>> > which case the -ko isn't sticky) or do a fresh update with -A to
>> > 'unstick' it. Of course, the -A will also clear any -r option you
>> > had...)
> [...]
>> but when I do a
>>
>> cvs diff -r 1.94 -r 1.95 if_tun.c
>>
>> on my local mirror i'm seeing the right $OpenBSD$ markers.
>
> What's right and what's wrong? Try
>
> $ cvs -q di -ko -r1.9{4,5} if_tun.c
>
> I guess cvsweb is using -ko for diffs, to show the diffs in the
> *repository*, not what you would see in a working directory.
I think it used to show diffs that looked more like the command line
versions, because I've never noticed they were wrong before, and I've
certainly looked at them in the past.
