Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Received-SPF: softfail (nike.apache.org: transitioning domain of
 nicolas.lalevee@hibnet.org does not designate 216.86.168.183 as permitted
 sender)
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
Subject: Re: Commit Candidates for Ivy 2.4.x
From: =?windows-1252?Q?Nicolas_Lalev=E9e?= <nicolas.lalevee@hibnet.org>
In-Reply-To: <E36D09ED-6A1F-4B8D-B182-8783AD578FAF@hibnet.org>
Date: Mon, 27 Oct 2014 23:56:48 +0100
Content-Transfer-Encoding: quoted-printable
Message-Id: <07416C71-0F15-414B-B8E4-09E28E7881AE@hibnet.org>
References: <A616BBCE-3C4C-442E-A872-0FA528419B29@hibnet.org>
 <CA+e2WO7muwiJ1YJN6BhH0gGQr0PzgA2rkcCUrM8LT_6frQ03Lg@mail.gmail.com>
 <E36D09ED-6A1F-4B8D-B182-8783AD578FAF@hibnet.org>
To: Ant Developers List <dev@ant.apache.org>


Le 26 oct. 2014 =E0 20:19, Nicolas Lalev=E9e =
<nicolas.lalevee@hibnet.org> a =E9crit :

>=20
> Le 26 oct. 2014 =E0 19:58, Jean-Louis Boudart =
<jeanlouis.boudart@gmail.com> a =E9crit :
>=20
>> Hi Nicolas,
>>=20
>> My answers bellow.
>>=20
>> 2014-10-26 19:18 GMT+01:00 Nicolas Lalev=E9e =
<nicolas.lalevee@hibnet.org>:
>>=20
>>> I have checked the branch 2.4.x. I have put back in the branch every =
thing
>>> that was obvious enough.
>>>=20
>>> There are some that may need to be merged back too, I would need =
some
>>> feedback about them.
>>>=20
>>> - IVY-1465 [1] doesn=92t seem to be fully finished. One part is in =
the
>>> branch, the commit =913076802a=92 [2] is not, and doesn=92t apply =
cleanly.
>>>=20
>> This commit looks like easy to merge manually, by the way what do you =
mean
>> by "doesn't apply cleanly =BB ?
>=20
> I did a cherry-pick and there were some conflict to resolve. I have to =
admit that I didn=92t looked at what the conflict was.=20

So I had a closer look to it. Something is actually going wrong, git is =
right about the patch not applying cleanly, some code is missing.

As far as I could look around, 3076802a [1] needs 8d851390 (r1592624) =
[2]. It was supposed to be merged by 57892b6e [3] but it doesn=92t look =
as fully merged. For instance, PomModuleDescriptorBuilder is modified by =
8d851390 but not by 57892b6e.

So I don=92t trust much the state the 2.4.x branch. Maybe should we =
better make the next 2.4 from trunk ?

Nicolas

[1] =
https://git-wip-us.apache.org/repos/asf?p=3Dant-ivy.git;a=3Dcommit;h=3D307=
6802a
[2] =
https://git-wip-us.apache.org/repos/asf?p=3Dant-ivy.git;a=3Dcommit;h=3D8d8=
51390
[3] =
https://git-wip-us.apache.org/repos/asf?p=3Dant-ivy.git;a=3Dcommit;h=3D578=
92b6e


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