commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@gmail.com>
Subject [Compress] redesign SVN and AL fixups
Date Thu, 10 Jul 2008 10:36:35 GMT
Just had a quick look at the compress redesign branch.

There are some problems with the SVN settings:

svn ps svn:eol-style native
src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
svn ps svn:eol-style native
src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java

Possibly also these:
svn ps svn:eol-style native src/main/resources/test1.xml
svn ps svn:eol-style native src/main/resources/test2.xml
svn ps svn:eol-style native src/test/resources/test1.xml
svn ps svn:eol-style native src/test/resources/test2.xml

Several java and XML files don't have AL headers:

pom.xml
src/main/java/org/apache/commons/compress/changes/Change.java
src/main/java/org/apache/commons/compress/changes/DeleteChange.java
src/main/java/org/apache/commons/compress/compressors/CompressorException.java
src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
src/main/resources/test1.xml
src/main/resources/test2.xml
src/site/site.xml
src/site/xdoc/index.xml
src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java
src/test/java/org/apache/commons/compress/changes/ChangeWorkerTest.java

Some files have merge conflict markers in them, e.g.:

<<<<<<< HEAD:testdata/test.xml

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message