Return-Path: Delivered-To: apmail-commons-dev-archive@www.apache.org Received: (qmail 74101 invoked from network); 10 Jul 2008 11:00:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jul 2008 11:00:06 -0000 Received: (qmail 65801 invoked by uid 500); 10 Jul 2008 11:00:06 -0000 Delivered-To: apmail-commons-dev-archive@commons.apache.org Received: (qmail 65712 invoked by uid 500); 10 Jul 2008 11:00:05 -0000 Mailing-List: contact dev-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Commons Developers List" Delivered-To: mailing list dev@commons.apache.org Received: (qmail 65699 invoked by uid 99); 10 Jul 2008 11:00:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2008 04:00:05 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of sebbaz@gmail.com designates 72.14.220.155 as permitted sender) Received: from [72.14.220.155] (HELO fg-out-1718.google.com) (72.14.220.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2008 10:59:14 +0000 Received: by fg-out-1718.google.com with SMTP id d23so1424350fga.24 for ; Thu, 10 Jul 2008 03:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=NdTPXae4NIRCJ1wALmFLaOhin6sArquScz/vb6G5gNk=; b=OOytXBrfsZg5meuwqUXL16+gdAQi7Rnl9MJ9++W3QuKI/dw3XFpYU3lqTT+i9O5GMn BilpSEARCh+JK0VomY+HKscNU0f6aPMbn7d3Pv5aozsbKJqqm5/BGhgFMk/BuzLanY2b BKmqxFjdGxm3QAgmqBhMrK8Bx4i4JdNLB5pyA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=nLTgcMWbwBV9ftAWYvAOHB/Q3lxB9P5/4TdzdxmXCWSVDb+T7Sp21bTeCz93Og9wmj obqITp8tdFP6n04q6NZ2FqI74/YWdk/zJXNtNTGYcxU2b+gPhgClUbpMgwkz2uS3kCIO qVdp6T73qSdR9MAXSCRr0gg3KclZWeEHPx9+w= Received: by 10.86.80.5 with SMTP id d5mr8624791fgb.11.1215687576257; Thu, 10 Jul 2008 03:59:36 -0700 (PDT) Received: by 10.86.62.18 with HTTP; Thu, 10 Jul 2008 03:59:36 -0700 (PDT) Message-ID: <25aac9fc0807100359ne06cbb3m835d9f977fc331ed@mail.gmail.com> Date: Thu, 10 Jul 2008 11:59:36 +0100 From: sebb To: "Commons Developers List" Subject: Re: [Compress] redesign SVN and AL fixups In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <25aac9fc0807100336n1be5e68fyb1d75a443ddaf2d8@mail.gmail.com> X-Virus-Checked: Checked by ClamAV on apache.org On 10/07/2008, 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? > Note: the checks were performed against the compress-redesign branch which is in the ASF repository. > > On Thu, Jul 10, 2008 at 12:36 PM, sebb 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: dev-unsubscribe@commons.apache.org > > For additional commands, e-mail: dev-help@commons.apache.org > > > > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org For additional commands, e-mail: dev-help@commons.apache.org