Re: svn update po/xxx conflict

2012-01-04 Thread Wolfgang Engelmann
Am Dienstag, 3. Januar 2012, 18:02:14 schrieb Jürgen Spitzmüller: > Wolfgang Engelmann wrote: > > Thanks again, Juergen and Richard, > > sorry that I forgot to configure make > > > > when doing make and make check, I get this error: > > > > make[3]: Entering directory `/mnt/sda/home/wolfgang/lyx-

Re: svn update po/xxx conflict

2012-01-03 Thread Jürgen Spitzmüller
Wolfgang Engelmann wrote: > Thanks again, Juergen and Richard, > sorry that I forgot to configure make > > when doing make and make check, I get this error: > > make[3]: Entering directory `/mnt/sda/home/wolfgang/lyx-devel/src' > make[3]: *** Keine Regel vorhanden, um das Target »graphics/Previ

Re: svn update po/xxx conflict

2012-01-03 Thread Wolfgang Engelmann
Am Dienstag, 3. Januar 2012, 14:57:48 schrieb Jürgen Spitzmüller: > Wolfgang Engelmann wrote: > > However, the lyx help shows still version 2.0.1 instead of 2.0.2. > > > > What else do I have to do to get the latest version? > > The version number gets updated at configure time IIRC. So try > ./c

Re: svn update po/xxx conflict

2012-01-03 Thread Richard Heck
On 01/03/2012 03:46 AM, Jürgen Spitzmüller wrote: Wolfgang Engelmann wrote: what is recommended to do if during a svn update of LyX a conflict in »po/xxx.po« is detected? Just delete the affected files (including the .rej etc. files) and update again. Or just do: svn revert po/*.po. Richard

Re: svn update po/xxx conflict

2012-01-03 Thread Jürgen Spitzmüller
Wolfgang Engelmann wrote: > However, the lyx help shows still version 2.0.1 instead of 2.0.2. > > What else do I have to do to get the latest version? The version number gets updated at configure time IIRC. So try ./configure ; make. If this doesn't help, you might even have to run ./autogen.sh

Re: svn update po/xxx conflict

2012-01-03 Thread Wolfgang Engelmann
*.po* > files. If you remove the whole dir, you will need to rerun ./autogen.sh > and configure after the update. > > Alternatively, you can also issue "svn revert -R *" from within the po > directory. > > Jürgen Thanks again, Jürgen After removing all the .po file

Re: svn update po/xxx conflict

2012-01-03 Thread Jürgen Spitzmüller
Wolfgang Engelmann wrote: > Shoud I remove the whole > /lyx-devel/po > or just its content > or should parts of it stay? Just remove the affected files (which have conflicts) or all *.po* files. If you remove the whole dir, you will need to rerun ./autogen.sh and configure after the update.

Re: svn update po/xxx conflict

2012-01-03 Thread Wolfgang Engelmann
Am Dienstag, 3. Januar 2012, 09:46:56 schrieb Jürgen Spitzmüller: > Wolfgang Engelmann wrote: > > what is recommended to do if during a svn update of LyX a > > conflict in »po/xxx.po« is detected? > > Just delete the affected files (including the .rej etc. files) and > u

Re: svn update po/xxx conflict

2012-01-03 Thread Jürgen Spitzmüller
Wolfgang Engelmann wrote: > what is recommended to do if during a svn update of LyX a > conflict in »po/xxx.po« is detected? Just delete the affected files (including the .rej etc. files) and update again. Jürgen

svn update po/xxx conflict

2012-01-03 Thread Wolfgang Engelmann
what is recommended to do if during a svn update of LyX a conflict in »po/xxx.po« is detected? Wolfgang

Re: svn update

2011-01-10 Thread Wolfgang Engelmann
Am Monday 10 January 2011 16:23:30 schrieb Vincent van Ravesteijn: > > I have compiled lyx 2 before by using svn. > > Now I want to update it and used > > svn update > > according to http://www.lyx.org/HowToUseSVN point 5 > > there were conflicts discovered in po/xx.

Re: svn update

2011-01-10 Thread Vincent van Ravesteijn
> I have compiled lyx 2 before by using svn. > Now I want to update it and used > svn update > according to http://www.lyx.org/HowToUseSVN point 5 > there were conflicts discovered in po/xx.po files > which I postponed, because I did not know what else to do. > Does anybod

svn update

2011-01-10 Thread Wolfgang Engelmann
Hallo, I have compiled lyx 2 before by using svn. Now I want to update it and used svn update according to http://www.lyx.org/HowToUseSVN point 5 there were conflicts discovered in po/xx.po files which I postponed, because I did not know what else to do. Does anybody know? I am also