On 17.11.2010 08:51, Stefan Sperling wrote:
On Wed, Nov 17, 2010 at 12:09:55AM -0000, [email protected] 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.
