merging adjacent changes

2016-02-22 Thread Philip Martin
"Bert Huijben" writes: > Personally I agree that I would like to see a text-conflict raised in > this specific case where the change regions touch each other. But then > there is that old discussion, I added the test because we had already, perhaps inadvertently, implemented the behaviour.

RE: (unknown)

2016-02-22 Thread Bert Huijben
[Moving thread to dev@s.a.o from users@] > -Original Message- > From: Bert Huijben [mailto:b...@qqmail.nl] > Sent: maandag 22 februari 2016 13:21 > To: 'Daniel Shahaf' ; 'Michal Matyl' > > Cc: us...@subversion.apache.org > Subject: RE: (unknown) > > I just reviewed most of the code tha

Re: svn commit: r1731656 - /subversion/trunk/subversion/svnserve/serve.c

2016-02-22 Thread James McCoy
On Feb 22, 2016 10:10 AM, wrote: > > Author: stefan2 > Date: Mon Feb 22 15:06:40 2016 > New Revision: 1731656 > > URL: http://svn.apache.org/viewvc?rev=1731656&view=rev > Log: > Switch svnserve to using the streamy log API. > --- subversion/trunk/subversion/svnserve/serve.c (original) > +++ subve