| Re: [mylyn-dev] [mylyn-integrators] Git migration complete |
After this commit I have 377 errors in my workspace. Here is what I did to resolve this. 1) in the target mylyn-e3.7.target I add the following to orbit org.apache.httpcomponents.httpclient, org.apache.httpcomponents.httpcore, org.hamcrest I add two new locations 2) new psf file for org.eclipse.test.performance How do share the changes with CVS I create a patch? I did an commit in my local git repository (the diff file is attached) |
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
{\fonttbl\f0\fnil\fcharset0 Monaco;}
{\colortbl;\red255\green255\blue255;\red153\green153\blue153;}
\paperw11900\paperh16840\margl1440\margr1440\vieww9000\viewh8400\viewkind0
\deftab720
\pard\pardeftab720
\f0\fs22 \cf0 diff --git a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target\
index 81fb49d..49255a6 100644\
--- a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target\
+++ b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target\
\pard\pardeftab720
\cf2 @@ -1,7 +1,7 @@\cf0 \
<?xml version="1.0" encoding="UTF-8" standalone="no"?>\
<?pde version="3.6"?>\
\
-<target name="mylyn-e3.7" sequenceNumber="12">\
+<target name="mylyn-e3.7" sequenceNumber="14">\
<locations>\
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\
<unit id="com.google.gwt.user" version="2.0.4.v20100709-0658"/>\
\cf2 @@ -34,6 +34,9 @@\cf0 \
<unit id="org.jdom" version="1.1.1.v201101151400"/>\
<unit id="org.mockito" version="1.8.4.v201102171835"/>\
<unit id="org.objenesis" version="1.0.0.v201105211943"/>\
+<unit id="org.apache.httpcomponents.httpclient" version="4.1.0.v201103311320"/>\
+<unit id="org.apache.httpcomponents.httpcore" version="4.1.0.v201101201700"/>\
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>\
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/"/>\
</location>\
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\
\cf2 @@ -53,5 +56,23 @@\cf0 \
<unit id="org.eclipse.jgit.feature.group" version="1.0.0.201106090707-r"/>\
<repository location="http://download.eclipse.org/egit/updates-1.0"/>\
</location>\
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\
+<unit id="org.eclipse.swtbot.eclipse.test.junit3.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>\
+</location>\
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\
+<unit id="org.tmatesoft.svnkit.feature.group" version="1.3.5.7406"/>\
+<unit id="com.sun.jna.feature.group" version="3.2.7"/>\
+<unit id="org.tigris.subversion.subclipse.feature.group" version="1.6.18"/>\
+<unit id="org.tigris.subversion.clientadapter.feature.feature.group" version="1.6.12"/>\
+<unit id="org.tigris.subversion.clientadapter.javahl.feature.feature.group" version="1.6.17"/>\
+<repository location="http://subclipse.tigris.org/update_1.6.x"/>\
+</location>\
</locations>\
</target>\
diff --git a/org.eclipse.mylyn.releng/target-definition/performance.psf b/org.eclipse.mylyn.releng/target-definition/performance.psf\
new file mode 100644\
index 0000000..4887383\
--- /dev/null\
+++ b/org.eclipse.mylyn.releng/target-definition/performance.psf\
\cf2 @@ -0,0 +1,5 @@\cf0 \
+<?xml version="1.0" encoding="UTF-8"?>\
+<psf version="2.0">\
+<provider id="org.eclipse.team.cvs.core.cvsnature">\
+<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/eclipse,org.eclipse.test.performance,org.eclipse.test.performance"/></provider>\
+</psf>\
}Frank Am 07.07.2011 um 15:45 schrieb alvaro sanchez:
|