[MPlayer-dev-eng] [PATCH] [DOCS] help_mp-pl.h update
Diego Biurrun
diego at biurrun.de
Fri Jun 6 18:03:28 CEST 2003
Diego Biurrun writes:
> OK, seems like I found the solution:
>
> http://cvsbook.red-bean.com/cvsbook.html#CVS_is_not_doing_line-end_conversion_correctly
>
>
> CVS is not doing line-end conversion correctly
>
> If you're running the CVS client on a non-Unix platform and are not
> getting the line-end conventions that you want in some working copy
> files, it's usually because they were accidentally added with -kb when
> they shouldn't have been. This can be fixed in the repository with,
> believe it or not, the command:
>
> floss$ cvs admin -kkv FILE
>
> The -kkv means to do normal keyword substitution and implies normal
> line-end conversions as well. (Internally, CVS is a bit confused about
> the difference between keyword substitution and line-end
> conversion. This confusion is reflected in the way the -k options can
> control both parameters.)
>
> Unfortunately, that admin command only fixes the file in the
> repository - your working copy still thinks the file is binary. You
> can hand edit the CVS/Entries line for that file, removing the -kb,
> but that won't solve the problem for any other working copies out
> there.
>
>
> Well, then please hand edit your CVS/Entries file and remove the -kb
> flag there if you wish to commit to help_mp-en.h without incurring my
> eternal wrath ;-)
Hmm, looks like the flag does get updated correctly when doing an
update, just not in my working directory... Anyway, it appears to
work and I'm glad I can now forget about it.
Diego
More information about the MPlayer-dev-eng
mailing list