[MPlayer-dev-eng] [PATCH] [DOCS] help_mp-pl.h update

[Diego Biurrun]

Diego Biurrun writes:
 > Diego Biurrun writes:
 >  > Dmitry Baryshkov writes:
 >  >  > В ?? 28.05.2003, в 04:33, Diego Biurrun пишет:
 >  >  > > Wojtek Kaniewski writes:
 >  >  > >  > besides, help_mp-en.h still has -kb flag, so $Revision$ isn't updated.
 >  >  > > 
 >  >  > > How can that flag be changed/removed?
 >  >  > cvs admin -kkv help_mp-en.h
 >  >  > But I'm not sure, how long it will work
 >  >  > (In _every_ checkout'ed copy, a -kb flag is set.
 >  >  > I'm not sure, if it can/will overwrite flag in repository).
 >  > 
 >  > Arpi, could you please run
 >  > 
 >  > cvs admin -kkv help_mp-en.h
 >  > 
 >  > on the repository?
 > 
 > Just tried myself, this is driving me nuts, it does not seem to have
 > any effect:
 > 
 > silver:/usr/src/mplayer/main/help$ cvs status help_mp-en.h
[...]
 > 
 > Any ideas?

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 ;-)

The files now have a correct $Revision$ keyword in main and 0_90.

Diego