I suggest we fix this in svn first and then you can start from a clean
git-svn clone if you want.
cheers
--
Torsten
On Jul 10, 2008, at 12:46, Christian Grobmeier wrote:
thanks for that hint.
@Torsten: can I fix that in my GIT branch without disturbing the git-
svn
commit?
Or should I wait till the commit has been finished?
On Thu, Jul 10, 2008 at 12:36 PM, sebb <[EMAIL PROTECTED]> wrote:
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
