I'm guessing that while committing the fix for IVY-1404 you probably did
a "git merge" against latest master of upstream, which created this
merge commit.
-Jaikiran
On 12/07/17 1:45 PM, Maarten Coene wrote:
Any idea where this commit comes from?I didn't touch any of these files as far
as I know...
Maarten
----- Doorgestuurd bericht -----
Van: "maart...@apache.org" <maart...@apache.org>
Aan: notificati...@ant.apache.org
Verzonden: woensdag 12 juli 10:06 2017
Onderwerp: [2/2] ant-ivy git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1a36ae09
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1a36ae09
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1a36ae09
Branch: refs/heads/master
Commit: 1a36ae09d2848d687895532acf46531437721692
Parents: 585a702 dcaacf4
Author: Maarten Coene <maart...@apache.org>
Authored: Wed Jul 12 10:05:54 2017 +0200
Committer: Maarten Coene <maart...@apache.org>
Committed: Wed Jul 12 10:05:54 2017 +0200
----------------------------------------------------------------------
.../xml/XmlModuleDescriptorParserTest.java | 56 ++++++++++++++++++++
.../hello/test-ivy-extends-absolute.xml | 25 +++++++++
.../plugins/parser/xml/foo%2Fbar/parent-ivy.xml | 27 ++++++++++
3 files changed, 108 insertions(+)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org
