Re: HEADS-UP: changing eol-style on files in the tree

Richard Feit Thu, 12 May 2005 09:32:35 -0700

OK, this is my current plan: - For the .zip archives, change all text files to have CRLF line endings. - For the .tgz archives, change all text files to have LF line endings. - For the .dmg archives, change all text files to have CR... oh, wait, scratch that one... :)

To identify text files, I'm planning on *including* a specific set rather than *excluding* a set. This is because missing a filetype on the includes list will have a minor effect (files hard to read in Notepad on Windows), while missing a filetype on the excludes list will have a worse effect (corrupting binary files). Feedback on this is welcome.

Rich

Richard Feit wrote:

Ouch -- I think it's even worse than that. The patch command on linux doesn't seem to work against files with CRLF line endings. It fails for me unless I convert both the patch file and the source file to have LF endings.

Let me look into option #2 (option #1 makes me nervous because the distribution being built is never the same as the one you'd get/test through 'build.dist.full' locally).

Thanks for the warning on this.

Rich

Jeremiah Johnson wrote:

This change concerns me because it may make patching problematic.  We
ran into the following scenario recently: a bug was filed and a patch
was associated with the bug; the file being patched happens to not have
the eol-style property for whatever reason and pre-patching was using
CRLF; the bug was generated on DOS and uploaded to Jira, but then
downloaded and patched from Linux; the download of the patch resulted in
LF but then the patch utility refused to apply the patch; dos2unix was
run on the source file and the patch applied, but now svn diff of the
two revisions shows that every line in the file changed.

It seems like there are two alternatives: 1) change the script on the
nightly build machine or 2) call fixcrlf during build.dist and include
*.txt, *.xml, *.css, *.java, *.jsp, *.jpf, *.jws, *.properties...  Heh -
obviously, neither of those options are ideal, but they seem more
'right' to me than making eol-style non-native.

- jeremiah

-----Original Message-----
From: Richard Feit
Sent: Wednesday, May 11, 2005 5:47 PM
To: Beehive Developers
Subject: HEADS-UP: changing eol-style on files in the tree
Hi all,
I will be changing the svn:eol-style on the following files (see http://issues.apache.org/jira/browse/BEEHIVE-638 for more info). I'll kick this off tomorrow morning at 10am MST unless anyone screams loudly. Also, if you know of any files I've missed or have included

in

error, please let me know.

Thanks,
Rich

---
test/dist-test/README.txt

netui/src/util/org/apache/beehive/netui/util/internal/concurrent/README. tx

t
netui/docs/tools/README.txt
netui/docs/BUILDING_NETUI_DOCS.txt
docs/forrest/src/documentation/README.txt
docs/dist-docs/README.txt
docs/dist-docs/toplvl-readme-trailer.txt
docs/dist-docs/rev-readme-trailer.txt
docs/updating_livesite.txt
docs/how_to_contribute_docs.txt
samples/petstoreWeb/web/site/default.css
samples/netui-samples/resources/css/style.css
samples/wsm-addressbook-fromWSDL/index.html
samples/wsm-employee/index.html
samples/wsm-addressbook/index.html
samples/wsm-addressbook-enhanced/index.html
samples/wsm-samples/webresult.html
samples/wsm-samples/index.html
samples/wsm-samples/handlerchain.html
samples/wsm-samples/soapbinding.html
samples/wsm-samples/webparam.html
samples/wsm-samples/webmethod.html
samples/wsm-samples/webservice.html
samples/wsm-samples/oneway.html
samples/wsm-samples/soapmessagehandlers.html
samples/wsm-blank/index.html
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Navigation.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Database.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Search.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Address.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Checkout.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/SignIn.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Cart.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/AllTests.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Account.java
samples/petstoreWeb/test-
src/org/apache/beehive/samples/petstore/test/Util.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/LineIt em

.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/Produc t.

java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/Addres s.

java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/ws/Cat eg

ory.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/ws/Pro du

ct.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/Cart.j av

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/OrderI te

m.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/Order. ja

va

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/Accoun t.

java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/Catego ry

.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/model/Item.j av

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/AccountAlreadyExistsException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/UserAlreadyExistsException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/NoSuchAddressException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/DataStoreException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/InvalidIdentifierException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/NoSuchOrderException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/NoSuchAccountException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/OrderAlreadyExistsException.java

samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/exc ep

tions/NoSuchUserException.java