I just repaired the nightly builds.  Apparently, some recent patches,
starting on April 1 (so probably a commit on March 31) created a local
conflict on the build server, causing the builds to fail.  The specific
files were the Helo, Ehlo, Rcpt and Mail handlers, if I recall correctly.

I haven't had time to investigate, but my first guess is line termination.
Looking at the repository, a number of files (including the above) are
missing the svn:eol-style property.  See
http://www.apache.org/dev/version-control.html, which also includes a link
to a file to be added to each committer's ~/.subversion/config file on their
working system.  My normal working system has it, but the build server did
not (it does now, which should prevent a reoccurrence of the problem).

I have also seen svn notices where far more lines than were changed were
marked as changed, and suspect that the lack of the svn:eol-style property
on the file is responsible.  Stefano appears to be using MS-Windows, and our
build process specifically converts line endings to UNIX conventions.

See
http://mail-archives.apache.org/mod_mbox/james-server-dev/200604.mbox/%3c200
[EMAIL PROTECTED] as an example.  Notice that
only the file(s) lacking svn:eol-style are being mis-represented in the
diff.

        --- Noel


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to