Re: svn commit: r1841719 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

2018-09-23 Thread Stefan Sperling
On Mon, Sep 24, 2018 at 02:39:08AM +0200, Johan Corveleyn wrote: > ^^ copy-paste-o in comment 'A/mu' -> 'A/B' Thank you. Should all be fixed with r1841796.

Re: svn commit: r1841719 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

2018-09-23 Thread Johan Corveleyn
On Sun, Sep 23, 2018 at 10:05 AM wrote: > > Author: stsp > Date: Sun Sep 23 08:05:24 2018 > New Revision: 1841719 > > URL: http://svn.apache.org/viewvc?rev=1841719&view=rev > Log: > Add a new XFAIL conflict resolver test. > > This is a basic test for 'local missing' conflicts with directories. > I

Re: msguniq in po-update.sh

2018-09-23 Thread Stefan Sperling
On Sun, Sep 23, 2018 at 11:06:40PM +0200, Mattias EngdegÄrd wrote: > Sorry about messing up the build with my ill-considered merge of r1841318 > (sv.po). Instead of attempting to merge from 1.11.x, which is what caused the > duplicated msgids, I should just have copied the entire file from that bra

msguniq in po-update.sh

2018-09-23 Thread Mattias EngdegÄrd
Sorry about messing up the build with my ill-considered merge of r1841318 (sv.po). Instead of attempting to merge from 1.11.x, which is what caused the duplicated msgids, I should just have copied the entire file from that branch and be done with it. That was just careless on my part. However,