ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jaikiran Pai <jai.forums2...@gmail.com>
Subject Re: ant git commit: Unbreak tests
Date Sat, 07 Jul 2018 13:08:08 GMT
Hello Martijn,

Thank you for spending time on this and for that checker. I did look 
into yourmail and considered itbefore deciding on what to do with the 
state of upstream branches.I decided to go with a complete revert 
approach (which I explain in a separate reply in this thread), because I 
personally felt a lot more confident in what it meant and involved, in 
terms of git technicalities.
Again, thank you very much for these efforts. Just like you and everyone 
else who's been involved in the project, I am not happy that we had to 
do a revertand the sequence of eventswhich led us to this.

-Jaikiran



On 06/07/18 5:19 PM, jkf@apache.org wrote:
> Hello all
>
> Just for your info, please take into consideration for a rollback or 
> not descision (I am neither happy with the commit, nor happy with a 
> rollback and therefore am 0 on rollback or not):
>
>
> I have written a small checker to remove all whitespace only diffs 
> from the diffs on the URL below.
>
> Significant whitespace changes that may have been lost would be 
> unlikely (space difference before "/>" , ">" or ")" and around "=" is 
> also ignored)
>
> That would reduce the original "2f64e0b5"  diff to (the extra lines 
> starting with \ before the diff are added by the checker i wrote)
>
> Removing whitespace only changes from asf.txt
> From: Gintas Grigelionis <gintas@apache.org>
> Date: Sun, 1 Jul 2018 13:31:35 +0000 (+0200)
> Subject: Trailing whitespace
> X-Git-Url: 
> https://git1-us-west.apache.org/repos/asf?p=ant.git;a=commitdiff_plain;h=2f64e0b5
>
> Trailing whitespace
> ---
>
> \====
> \@ -87,11 +87,11 @@ <li><xsl:value-of select="@name"/></li> 
> </xsl:for-each> </ul--> <h1><a name="top">JDepend Analysis</a></h1>
<p 
> align="right">Designed for use with <a 
> href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and 
> <a href="https://ant.apache.org">Ant</a>.</p> <hr size="2"/>
<table 
> width="100%"><tr><td> <a name="NVsummary"><h2>Summary</h2></a>

> </td><td align="right">
> \@ -87,11 +87,11 @@ <li><xsl:value-of select="@name"/></li> 
> </xsl:for-each> </ul--> <h1><a name="top">JDepend Analysis</a></h1>
<p 
> align="right">Designed for use with <a 
> href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and 
> <a href="http://jakarta.apache.org">Ant</a>.</p> <hr size="2"/>
<table 
> width="100%"><tr><td> <a name="NVsummary"><h2>Summary</h2></a>

> </td><td align="right">
> \====
> diff --git a/src/etc/jdepend.xsl b/src/etc/jdepend.xsl
> index f813297..907ade2 100644
> --- a/src/etc/jdepend.xsl
> +++ b/src/etc/jdepend.xsl
> @@ -87,11 +87,11 @@
>          <li><xsl:value-of select="@name"/></li>
>      </xsl:for-each>
>      </ul-->
> -
> +
>      <h1><a name="top">JDepend Analysis</a></h1>
> -    <p align="right">Designed for use with <a 
> href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and 
> <a href="http://jakarta.apache.org">Ant</a>.</p>
> -    <hr size="2" />
> -
> +    <p align="right">Designed for use with <a 
> href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and 
> <a href="https://ant.apache.org">Ant</a>.</p>
> +    <hr size="2"/>
> +
>      <table width="100%"><tr><td>
>      <a name="NVsummary"><h2>Summary</h2></a>
>      </td><td align="right">
> \====
> \@ -57,8 +57,8 @@ <target name="prepare-setup"> <mkdir 
> dir="${test.dir}/src/org/apache/tools/ant"/> <mkdir 
> dir="${test.dir}/dest"/> <echo 
> file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java"> 
> <![CDATA[ /* * Licensed to the Apache Software Foundation (ASF) under 
> one or more * contributor license agreements. See the NOTICE file 
> distributed with
> \@ -57,8 +57,8 @@ <target name="prepare-setup"> <mkdir 
> dir="${test.dir}/src/org/apache/tools/ant"/> <mkdir 
> dir="${test.dir}/dest"/> <echo 
> file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java"><![CDATA[ 
> /* * Licensed to the Apache Software Foundation (ASF) under one or 
> more * contributor license agreements. See the NOTICE file distributed 
> with
> \====
> diff --git a/src/etc/performance/dirscanner.xml 
> b/src/etc/performance/dirscanner.xml
> index 5628a46..2c845c3 100644
> --- a/src/etc/performance/dirscanner.xml
> +++ b/src/etc/performance/dirscanner.xml
> @@ -57,8 +57,8 @@
>    <target name="prepare-setup">
>      <mkdir dir="${test.dir}/src/org/apache/tools/ant"/>
>      <mkdir dir="${test.dir}/dest"/>
> -    <echo 
> file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java"
> -          ><![CDATA[
> +    <echo 
> file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java">
> +      <![CDATA[
>  /*
>   *  Licensed to the Apache Software Foundation (ASF) under one or more
>   *  contributor license agreements.  See the NOTICE file distributed 
> with
> \====
> \@ -21,23 +21,21 @@ <taskdef name="cvspass" 
> classname="org.apache.tools.ant.taskdefs.CVSPass"/> <target 
> name="test1"> <cvspass/> </target> <target name="test2"> <cvspass

> cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic" 
> passfile="testpassfile.tmp"%/> </target> <!-- testPassFile --> <target

> name="test3"> <cvspass 
> cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic" 
> password="anoncvs" passfile="testpassfile.tmp"/> </target> <!-- 
> testPassFileDuplicateEntry -->
> \@ -21,23 +21,21 @@ <taskdef name="cvspass" 
> classname="org.apache.tools.ant.taskdefs.CVSPass"/> <target 
> name="test1"> <cvspass/> </target> <target name="test2"> <cvspass

> cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic" 
> passfile="testpassfile.tmp"/> </target> <!-- testPassFile --> <target

> name="test3"> <cvspass 
> cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic" 
> password="anoncvs" passfile="testpassfile.tmp"/> </target> <!-- 
> testPassFileDuplicateEntry -->
> \====
> diff --git a/src/etc/testcases/taskdefs/cvspass.xml 
> b/src/etc/testcases/taskdefs/cvspass.xml
> index bbca110..690dfcf 100644
> --- a/src/etc/testcases/taskdefs/cvspass.xml
> +++ b/src/etc/testcases/taskdefs/cvspass.xml
> @@ -21,23 +21,21 @@
>    <taskdef name="cvspass" 
> classname="org.apache.tools.ant.taskdefs.CVSPass"/>
>
>    <target name="test1">
> -    <cvspass />
> +    <cvspass/>
>    </target>
> -
> +
>    <target name="test2">
>      <cvspass
> cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic"
> -      passfile="testpassfile.tmp"
> -    />
> +      passfile="testpassfile.tmp"%/>
>    </target>
> -
> +
>    <!-- testPassFile -->
>    <target name="test3">
>      <cvspass
> cvsroot=":pserver:anoncvs@jakarta.apache.org:/home/cvspublic"
>        password="anoncvs"
> -      passfile="testpassfile.tmp"
> -    />
> +      passfile="testpassfile.tmp"/>
>    </target>
>
> In the cherry-pick commit (7df9120e) the last difference does not 
> surface.
>
>
> Best regards, Martijn
>
>
>
> On 06-07-18 11:02, Stefan Bodewig wrote:
>> On 2018-07-06, Jaikiran Pai wrote:
>>
>>> On 05/07/18 2:42 PM, Stefan Bodewig wrote:
>>>> On 2018-07-05, Jaikiran Pai wrote:
>>>>> I personally believe that reviewing these meaningless changes is a
>>>>> waste of time and energy. I'm in favour of rolling back the entire
>>>>> commit set if that's what it takes.
>>>> +1
>>>> although reverting the commits in both branches and merging back the
>>>> 1.9.x branch is likely going to end in an ugly merge that will need
>>>> review as well. Hopefullly a shorter one.
>>> Yes, I agree.I plan to attempt this later tonight (around 8 hours from
>>> now) if no one else gets to it before that. Just letting it know here,
>>> so that we don't end up duplicating these efforts.
>> Thank you. I'm unlikely to get there before you do, would have tackled
>> it tomorrow.
>>
>> Stefan
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
>> For additional commands, e-mail: dev-help@ant.apache.org
>>
>
>


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


Mime
View raw message