Nope, no Git involved. Just a lazy conflicts merge up it seems. All SVN. It seems I don't have the latest svn config on my newest dev machine. Prob lost it after an ubuntu reinstall.
- Mark On Feb 1, 2013, at 11:43 AM, Robert Muir <[email protected]> wrote: > I supposed that's my answer (to the git-data-loss question)... > > Git considered harmful! > > On Fri, Feb 1, 2013 at 11:30 AM, Apache Jenkins Server > <[email protected]> wrote: >> Build: https://builds.apache.org/job/Lucene-Solr-Tests-4.x-Java6/1298/ >> >> All tests passed >> >> Build Log: >> [...truncated 29944 lines...] >> BUILD FAILED >> /usr/home/hudson/hudson-slave/workspace/Lucene-Solr-Tests-4.x-Java6/build.xml:305: >> The following error occurred while executing this line: >> /usr/home/hudson/hudson-slave/workspace/Lucene-Solr-Tests-4.x-Java6/extra-targets.xml:120: >> The following files are missing svn:eol-style (or binary svn:mime-type): >> * solr/core/src/test/org/apache/solr/update/HardAutoCommitTest.java >> >> Total time: 56 minutes 3 seconds >> Build step 'Invoke Ant' marked build as failure >> Archiving artifacts >> Recording test results >> Email was triggered for: Failure >> Sending email for trigger: Failure >> >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
