Mangled diff

[GoogleCodeExporter]

Attached email does not display correctly; chunks are rearranged strangely:

On 10/31/2011 05:13 PM, someone wrote:
supposedly quoted stuff (displayed in black!)

stuff

=======================================
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -1,0 +1,0 @@

=======================================
+        </autoupdate>
+    </target>
+    <target name="downloadbinaries" description="Download external binaries 
not stored in Mercurial sources." depends="-taskdefs">
         <property file="${user.home}/.nbbuild.properties"/> <!-- permit binaries.cache to be overridden -->
         <property name="binaries.cache" location="${user.home}/.hgexternalcache"/>
         <property name="binaries.server" value="http://hg.netbeans.org/binaries/"/>
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -7,0 +7,0 @@

 <?xml version="1.0" encoding="UTF-8"?>
 <project name="ruby" basedir=".">
     <import file="nbproject/build-impl.xml"/>
-    <target name="downloadbinaries" description="Download external binaries 
not stored in Mercurial sources.">
-        <!-- XXX if platform set to 7.0+, could instead use 
${harness.dir}/tasks.jar, or just depend on -taskdefs target -->
-        <taskdef classpath="${java.io.tmpdir}/tasks.jar" 
resource="org/netbeans/nbbuild/taskdefs.properties"/>
+    <available property="have.junit" 
file="${nbplatform.active.dir}/platform/update_tracking/org-netbeans-libs-junit4
.xml"/>
+    <target name="-download-junit4" description="Workaround for removal of 
JUnit from NB 7.0." depends="-taskdefs" unless="have.junit">
+        <autoupdate installdir="${nbplatform.active.dir}" 
updatecenter="http://updates.netbeans.org/netbeans/updates/7.0.1/uc/final/certif
ied/catalog.xml.gz">
+            <modules includes="org[.]netbeans[.]libs[.]junit4"/>
 nbplatform.active.dir=${suite.dir}/.hg/nb
 harness.dir=${nbplatform.active.dir}/harness
 bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/6.9/uc
/final/stable/catalog.xml.gz
-#autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/7.0.1/uc/f
inal/distribution/catalog.xml.gz
+autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/7.0.1/uc/fi
nal/distribution/catalog.xml.gz
 nbm.module.author=Thomas E. Enebo

rest of text...

Original issue reported on code.google.com by typr...@gmail.com on 1 Nov 2011 at 4:39

Attachments:

• mangled.eml

[Qeole]

Obsoleted in v2 by c8436ddca5160c736aaf67326ccbaa08ffb01ae5.