Kornel Benko wrote:

> Nice article. So for us it would suffice to create '.gitattributes' file
> with the content: *.po text

Almost. The last time I investigated this I was about to add the attached 
one, but it is not enough. Not only the line ends of the files are broken, 
but they do contain also some '\r' characters in the middle of lines. This 
cannot be prevented with .gitattributes. I guess that po/lyx_pot.py is 
broken on windows.

I fixed the .po files with some sed magic now (like I did already in 
november). I really hate the extra work that is imposed by these 
uncommunicated last minute changes. Until somebody finds the bug in the 
python script we should forbid .po file remerging on windows IMHO.


Georg
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.po text


Reply via email to