*.po conflicts after updating SVN
Dear LyXers, after updating my working directory from the LyX SVN with /usr/local/src/lyx-devel svn update I got a whole bunch of conflicts in the lyx-devel/po/ directory, e.g. ca.gmo ca.po ca.po.mine ca.po.r25470 ca.po.r25661 ca.po~ (and similar for de, es, fr, gl, he, ...) resulting in failure when I try to `make` LyX: make[3]: Entering directory `/usr/local/src/lyx-devel/po' /usr/bin/msgmerge --update ca.po lyx16.pot ca.po: Warnung: Zeichensatz fehlt im Kopfeintrag. Konvertierung der Meldungen in den Zeichensatz des Anwenders wird fehlschlagen. ca.po:21:2: syntax error ca.po:21: Schlüsselwort »mine« ist unbekannt ca.po:25: Schlüsselwort »r25661« ist unbekannt . . . I did not (manually/explicitely) change the *.po files, rather it seems that they are updated during the building of LyX - resulting in conflicts whenever the upstream file changes. What did I wrong? How could I most easily change all these files to the latest SVN version? Could these conflicts be prevented somehow? Thanks, Günter
Re: *.po conflicts after updating SVN
What did I wrong? nothing, this happens when po directory is rebuilt. this usually happens only if lyx.pot is missing, otherwise plain make command shouldn't trigger it. How could I most easily change all these files to the latest SVN version? go to the po directory, then svn revert -R * Could these conflicts be prevented somehow? hardly. pavel
Re: *.po conflicts after updating SVN
G. Milde wrote: How could I most easily change all these files to the latest SVN version? delete them and svn up again. Jürgen
Re: *.po conflicts after updating SVN
On 18.07.08, Pavel Sanda wrote: What did I wrong? nothing, this happens when po directory is rebuilt. this usually happens only if lyx.pot is missing, otherwise plain make command shouldn't trigger it. As I did not delete lyx.pot by hand, I wonder if this was done by `make clean` or `make distclean` and whether the latter should be avoided. How could I most easily change all these files to the latest SVN version? go to the po directory, then svn revert -R * This works nice, thanks a lot. Could these conflicts be prevented somehow? hardly. Too sad. Thanks again, Günter
Re: *.po conflicts after updating SVN
On 18.07.08, Pavel Sanda wrote: nothing, this happens when po directory is rebuilt. this usually happens only if lyx.pot is missing, otherwise plain make command shouldn't trigger it. As I did not delete lyx.pot by hand, I wonder if this was done by `make clean` or `make distclean` and whether the latter should be avoided. make clean shouldn't touch it, possibly by make distclean, not sure now. pavel
*.po conflicts after updating SVN
Dear LyXers, after updating my working directory from the LyX SVN with /usr/local/src/lyx-devel svn update I got a whole bunch of conflicts in the lyx-devel/po/ directory, e.g. ca.gmo ca.po ca.po.mine ca.po.r25470 ca.po.r25661 ca.po~ (and similar for de, es, fr, gl, he, ...) resulting in failure when I try to `make` LyX: make[3]: Entering directory `/usr/local/src/lyx-devel/po' /usr/bin/msgmerge --update ca.po lyx16.pot ca.po: Warnung: Zeichensatz fehlt im Kopfeintrag. Konvertierung der Meldungen in den Zeichensatz des Anwenders wird fehlschlagen. ca.po:21:2: syntax error ca.po:21: Schlüsselwort »mine« ist unbekannt ca.po:25: Schlüsselwort »r25661« ist unbekannt . . . I did not (manually/explicitely) change the *.po files, rather it seems that they are updated during the building of LyX - resulting in conflicts whenever the upstream file changes. What did I wrong? How could I most easily change all these files to the latest SVN version? Could these conflicts be prevented somehow? Thanks, Günter
Re: *.po conflicts after updating SVN
What did I wrong? nothing, this happens when po directory is rebuilt. this usually happens only if lyx.pot is missing, otherwise plain make command shouldn't trigger it. How could I most easily change all these files to the latest SVN version? go to the po directory, then svn revert -R * Could these conflicts be prevented somehow? hardly. pavel
Re: *.po conflicts after updating SVN
G. Milde wrote: How could I most easily change all these files to the latest SVN version? delete them and svn up again. Jürgen
Re: *.po conflicts after updating SVN
On 18.07.08, Pavel Sanda wrote: What did I wrong? nothing, this happens when po directory is rebuilt. this usually happens only if lyx.pot is missing, otherwise plain make command shouldn't trigger it. As I did not delete lyx.pot by hand, I wonder if this was done by `make clean` or `make distclean` and whether the latter should be avoided. How could I most easily change all these files to the latest SVN version? go to the po directory, then svn revert -R * This works nice, thanks a lot. Could these conflicts be prevented somehow? hardly. Too sad. Thanks again, Günter
Re: *.po conflicts after updating SVN
On 18.07.08, Pavel Sanda wrote: nothing, this happens when po directory is rebuilt. this usually happens only if lyx.pot is missing, otherwise plain make command shouldn't trigger it. As I did not delete lyx.pot by hand, I wonder if this was done by `make clean` or `make distclean` and whether the latter should be avoided. make clean shouldn't touch it, possibly by make distclean, not sure now. pavel
*.po conflicts after updating SVN
Dear LyXers, after updating my working directory from the LyX SVN with /usr/local/src/lyx-devel> svn update I got a whole bunch of conflicts in the lyx-devel/po/ directory, e.g. ca.gmo ca.po ca.po.mine ca.po.r25470 ca.po.r25661 ca.po~ (and similar for de, es, fr, gl, he, ...) resulting in failure when I try to `make` LyX: make[3]: Entering directory `/usr/local/src/lyx-devel/po' /usr/bin/msgmerge --update ca.po lyx16.pot ca.po: Warnung: Zeichensatz fehlt im Kopfeintrag. Konvertierung der Meldungen in den Zeichensatz des Anwenders wird fehlschlagen. ca.po:21:2: syntax error ca.po:21: Schlüsselwort »mine« ist unbekannt ca.po:25: Schlüsselwort »r25661« ist unbekannt . . . I did not (manually/explicitely) change the *.po files, rather it seems that they are updated during the building of LyX - resulting in conflicts whenever the upstream file changes. What did I wrong? How could I most easily change all these files to the latest SVN version? Could these conflicts be prevented somehow? Thanks, Günter
Re: *.po conflicts after updating SVN
> What did I wrong? nothing, this happens when po directory is rebuilt. this usually happens only if lyx.pot is missing, otherwise plain "make" command shouldn't trigger it. > How could I most easily change all these files to the latest SVN version? go to the po directory, then "svn revert -R *" > Could these conflicts be prevented somehow? hardly. pavel
Re: *.po conflicts after updating SVN
G. Milde wrote: > How could I most easily change all these files to the latest SVN version? delete them and svn up again. Jürgen
Re: *.po conflicts after updating SVN
On 18.07.08, Pavel Sanda wrote: > > What did I wrong? > nothing, this happens when po directory is rebuilt. > this usually happens only if lyx.pot is missing, > otherwise plain "make" command shouldn't trigger it. As I did not delete lyx.pot by hand, I wonder if this was done by `make clean` or `make distclean` and whether the latter should be avoided. > > How could I most easily change all these files to the latest SVN version? > go to the po directory, then "svn revert -R *" This works nice, thanks a lot. > > Could these conflicts be prevented somehow? > hardly. Too sad. Thanks again, Günter
Re: *.po conflicts after updating SVN
> On 18.07.08, Pavel Sanda wrote: > > nothing, this happens when po directory is rebuilt. > > this usually happens only if lyx.pot is missing, > > otherwise plain "make" command shouldn't trigger it. > > As I did not delete lyx.pot by hand, I wonder if this was done by > `make clean` or `make distclean` and whether the latter should be avoided. make clean shouldn't touch it, possibly by make distclean, not sure now. pavel
