[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1035869 [1/19] - in /subversion/branches/performance: ./ build/ build/generator/ build/generator/templates/ build/win32/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/ja...

From: Stefan Fuhrmann <stefanfuhrmann_at_alice-dsl.de>
Date: Thu, 18 Nov 2010 10:55:34 +0100

On 17.11.2010 08:51, Stefan Sperling wrote:
> On Wed, Nov 17, 2010 at 12:09:55AM -0000, stefan2_at_apache.org wrote:
>> Author: stefan2
>> Date: Wed Nov 17 00:09:50 2010
>> New Revision: 1035869
>>
>> URL: http://svn.apache.org/viewvc?rev=1035869&view=rev
>> Log:
>> On the performance branch:
>> Bring up-to-date with trunk.
>> [lots of tree conflicts due to moved files were to resolve]
> Just out of curiousity:
> Can you describe what kinds of conflicts you were seeing?
> Were the tree conflicts within the build/generator directory?
> Or elsewhere, too?
And JAVA bindings (and possibly a few other places).
> Tree conflicts should only happen if you also deleted/moved/edited the
> correspponding files (or directories) on the performance branch.
>
They were all of the "deleted (renamed) after modification" variety.

-- Stefan^2.
Received on 2010-11-18 10:56:24 CET

This is an archived mail posted to the Subversion Dev mailing list.