ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject git commit: committed a bad merge
Date Sat, 26 Jul 2014 06:01:09 GMT
Repository: ant-antlibs-props
Updated Branches:
  refs/heads/master b1d008e4e -> 0d2009b5f


committed a bad merge


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/commit/0d2009b5
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/tree/0d2009b5
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/diff/0d2009b5

Branch: refs/heads/master
Commit: 0d2009b5f4d52cecad25cfa3ca5ebcdfea4e78ba
Parents: b1d008e
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Sat Jul 26 08:00:54 2014 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Sat Jul 26 08:00:54 2014 +0200

----------------------------------------------------------------------
 prepare.xml | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/blob/0d2009b5/prepare.xml
----------------------------------------------------------------------
diff --git a/prepare.xml b/prepare.xml
index 852a4af..8499ea6 100644
--- a/prepare.xml
+++ b/prepare.xml
@@ -21,57 +21,18 @@ under the License.
 <!--
 Interim build-snippet.
 
-<<<<<<< HEAD
-The AntLibs depend on the common build infrastructure supplied by the 
-antlibs-common project. In subversion these are included via svn:external
-directive. After migration to git there is need to have successor to that
-directive. Until we have that, we could do a 'manual' git-clone.
-
-=======
->>>>>>> add common submodule
 The original of this snippet is maintained in the antlib-common project. 
 -->
 <project default="bootstrap" xmlns:unless="ant:unless" xmlns:if="ant:if">
 
-<<<<<<< HEAD
-  <!-- AntLib-common Git-URL, so we could 'svn:external' that manually. -->
-  <property name="antlib.common.git" value="https://git-wip-us.apache.org/repos/asf/ant-antlibs-common.git"/>
-  <!-- Git executable -->
-  <property name="git" value="git"/>
-  
-=======
->>>>>>> add common submodule
   <!-- Which released version of AntUnit to use, where to download, where to store. -->
   <property name="antunit.version" value="1.3"/>
   <property name="antunit.url" value="http://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
   <property name="antunit.file" value="ant-antunit.jar"/>
 
   <!-- Skip unnecessary tasks. -->
-<<<<<<< HEAD
-  <available property="common.present"  file="common" type="dir"/>
-  <available property="antunit.present" file="${antunit.file}"/>
-
-
-  <target name="clone-common" unless="common.present">
-    <echo message="cloning antlib-common"/>
-    <exec executable="${git}" taskname="git">
-      <arg value="clone"/>
-      <arg value="${antlib.common.git}"/>
-      <arg value="common"/>
-    </exec>
-  </target>
-
-  <target name="update-common" if="common.present">
-    <echo message="updating antlib-common"/>
-    <exec executable="${git}" dir="common" taskname="git">
-      <arg value="pull"/>
-    </exec>
-  </target>
-
-=======
   <available property="antunit.present" file="${antunit.file}"/>
 
->>>>>>> add common submodule
   <target name="update-prepare-script">
     <echo>updating prepare.xml</echo>
     <copy file="common/prepare.xml" tofile="prepare.xml"/>
@@ -85,13 +46,8 @@ The original of this snippet is maintained in the antlib-common project.
   
   <!-- Use a 'bootstrap-phase' so changes of the preparation could be catched in the same
CI-cycle. -->
   <target name="bootstrap" 
-<<<<<<< HEAD
-          depends="clone-common,update-common,update-prepare-script"
-          description="Bootstraps the preparation script by cloning the antlib-common and
updating this script from there."
-=======
           depends="update-prepare-script"
           description="Bootstraps the preparation script by updating this script from common."
->>>>>>> add common submodule
   >
     <echo>Bootstrap done. Next step:</echo> 
     <echo>  ant -f prepare.xml prepare</echo>
@@ -106,8 +62,4 @@ The original of this snippet is maintained in the antlib-common project.
     <echo> ant -lib ${antunit.file} -lib build/lib test</echo>
   </target>
 
-<<<<<<< HEAD
-</project>
-=======
 </project>
->>>>>>> add common submodule


Mime
View raw message