Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-12 Thread Daniel Shahaf
Dongsheng Song wrote on Wed, Jul 03, 2013 at 14:26:25 +0800: > On 2013/7/3 6:55, Konstantin Kolinko wrote: > > 2013/7/3 Andreas Stieger : > >> Hi There, > >> > >> On 02/07/13 16:00, Dongsheng Song wrote: > >>> Today, when I merge zh_CN.po from trunk to 1.8.x, I had encounter the > >>> following err

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-03 Thread Dongsheng Song
于 2013/7/3 18:11, Konstantin Kolinko 写道: > 2013/7/3 Dongsheng Song : >> On 2013/7/3 6:55, Konstantin Kolinko wrote: >>> 2013/7/3 Andreas Stieger : Hi There, On 02/07/13 16:00, Dongsheng Song wrote: > Today, when I merge zh_CN.po from trunk to 1.8.x, I had encounter the > foll

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-03 Thread Konstantin Kolinko
2013/7/3 Dongsheng Song : > On 2013/7/3 6:55, Konstantin Kolinko wrote: >> 2013/7/3 Andreas Stieger : >>> Hi There, >>> >>> On 02/07/13 16:00, Dongsheng Song wrote: Today, when I merge zh_CN.po from trunk to 1.8.x, I had encounter the following error: $ python ../../../../trunk/

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-02 Thread Dongsheng Song
On 2013/7/3 6:55, Konstantin Kolinko wrote: > 2013/7/3 Andreas Stieger : >> Hi There, >> >> On 02/07/13 16:00, Dongsheng Song wrote: >>> Today, when I merge zh_CN.po from trunk to 1.8.x, I had encounter the >>> following error: >>> >>> $ python ../../../../trunk/tools/dev/po-merge.py < >>> ../../..

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-02 Thread Dongsheng Song
On 2013/7/3 4:05, Andreas Stieger wrote: > Hi There, > > On 02/07/13 16:00, Dongsheng Song wrote: >> Today, when I merge zh_CN.po from trunk to 1.8.x, I had encounter the >> following error: >> >> $ python ../../../../trunk/tools/dev/po-merge.py < >> ../../../../trunk/subversion/po/zh_CN.po zh_CN.p

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-02 Thread Konstantin Kolinko
2013/7/3 Andreas Stieger : > Hi There, > > On 02/07/13 16:00, Dongsheng Song wrote: >> Today, when I merge zh_CN.po from trunk to 1.8.x, I had encounter the >> following error: >> >> $ python ../../../../trunk/tools/dev/po-merge.py < >> ../../../../trunk/subversion/po/zh_CN.po zh_CN.po >> Traceback

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-02 Thread Andreas Stieger
Hi There, On 02/07/13 16:00, Dongsheng Song wrote: > Today, when I merge zh_CN.po from trunk to 1.8.x, I had encounter the > following error: > > $ python ../../../../trunk/tools/dev/po-merge.py < > ../../../../trunk/subversion/po/zh_CN.po zh_CN.po > Traceback (most recent call last): > File "../.

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-02 Thread Daniel Shahaf
Dongsheng Song wrote on Tue, Jul 02, 2013 at 23:00:59 +0800: > 于 2013/7/2 22:30, Daniel Shahaf 写道: > >dongsh...@apache.org wrote on Tue, Jul 02, 2013 at 14:12:44 -: > >>Author: dongsheng > >>Date: Tue Jul 2 14:12:44 2013 > >>New Revision: 1498947 > >> > >>URL: http://svn.apache.org/r1498947 >

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-02 Thread Dongsheng Song
于 2013/7/2 22:30, Daniel Shahaf 写道: dongsh...@apache.org wrote on Tue, Jul 02, 2013 at 14:12:44 -: Author: dongsheng Date: Tue Jul 2 14:12:44 2013 New Revision: 1498947 URL: http://svn.apache.org/r1498947 Log: Make sure msgstr is not None before do iteration. Obvious fix. No, it's not a

Re: svn commit: r1498947 - /subversion/trunk/tools/dev/po-merge.py

2013-07-02 Thread Daniel Shahaf
dongsh...@apache.org wrote on Tue, Jul 02, 2013 at 14:12:44 -: > Author: dongsheng > Date: Tue Jul 2 14:12:44 2013 > New Revision: 1498947 > > URL: http://svn.apache.org/r1498947 > Log: > Make sure msgstr is not None before do iteration. > > Obvious fix. > No, it's not an obvious fix. It'