Am Sonntag, 11. Juni 2017 um 08:55:11, schrieb Georg Baum <georg.b...@post.rwth-aachen.de> > Kornel Benko wrote: > > > Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum > >> > >> I would suggest to use git correctly instead of fixing broken line ends > >> again and again, producing huge nonsense diffs. We had this discussion > >> several times in the past. > >> > > > > Maybe a problem in merging and pushing from windows. > > Scenario to merge: > > #: src/frontends/qt4/ui/BiblioUi.ui:244<CR><LF> > > with > > #: src/frontends/qt4/ui/ColorUi.ui:73<CR><LF> > > results in > > #: src/frontends/qt4/ui/BiblioUi.ui:244<CR> > > src/frontends/qt4/ui/ColorUi.ui:73<CR><LF> and after push the last > > <CR><LF> is converted to <LF> > > Probably. However, this does not happen with a correctly configured git: On > windows, both .ui and .po use windows line ends, on unix both .po and .ui > use unix line ends, so merging works fine in both cases. The merge script > works with windoes line ends IIRC, as long as all files use them. >
So what is Uwe doing when he is re-merging? Probably calling
development/tools/mergepo.py.
I am not sure (because I am not expert) what happens on Windows.
See mergepo_minimaldiff() there:
// What happens here with line endings?
po2 = polib.pofile(source)
// This one looks good, but shouldn't we better explicitly open for
text-mode?
po1 = io.open(target, 'r', encoding='utf_8', newline=None)
oldlines = read(po1)
...
Kornel
signature.asc
Description: This is a digitally signed message part.
