I've notice a difference in the classlib/depends/lib folder in the java6 branch and the trunk.
https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/depends/libs/ The only sub-folder is 'build' and there are no file. https://svn.apache.org/repos/asf/harmony/enhanced/classlib/branches/java6/depends/libs/ This contains 'build' and a 'windows.x86' folder, though oddly, the 'svn:ignore' also contains 'windows.x86' I ran the following merge and it results in the following diff. Any objections to committing this? === C:\dev\harmony\java6\working_classlib\depends\libs>svn merge https://svn.apache.org/repos/asf/harmony/enhanced/classlib/branches/java6/depends/libs https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/depends/libs . === C:\dev\harmony\java6\working_classlib\depends\libs>svn status M . D windows.x86 D windows.x86\ICUInterface34.dll D windows.x86\icuin34.dll D windows.x86\icudt34.dll D windows.x86\icuuc34.dll C:\dev\harmony\java6\working_classlib\depends\libs>svn diff Property changes on: . ___________________________________________________________________ Added: svn:mergeinfo Merged /harmony/enhanced/classlib/trunk/depends/libs:r544451-892116 Index: windows.x86/ICUInterface34.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: windows.x86/icuin34.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: windows.x86/icudt34.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: windows.x86/icuuc34.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream
