diff options
| author | Silenio Quarti <silenio> | 2011-07-19 17:38:16 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio> | 2011-07-19 17:38:16 -0400 |
| commit | 5e11d867e8978547a0ac8727b8f741bf8d026189 (patch) | |
| tree | 0a30d5de00e3982fc7e3567db7117a2f20bff158 | |
| parent | 871aa1b7ba200c32c50d6c0a87817e6097e36f74 (diff) | |
| download | eclipse.platform.swt-5e11d867e8978547a0ac8727b8f741bf8d026189.tar.gz eclipse.platform.swt-5e11d867e8978547a0ac8727b8f741bf8d026189.tar.xz eclipse.platform.swt-5e11d867e8978547a0ac8727b8f741bf8d026189.zip | |
using rebase to push and reset to clean repo
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 7594ce816c..5136a7f051 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -1008,48 +1008,68 @@ </target> <target name="pull_remote"> + <delete includeemptydirs="true"> + <fileset dir="${bin.repo}" defaultexcludes="false"> + <include name="bundles/*/tmpdir/**"/> + </fileset> + </delete> <antcall target="init_repo"> <param name="repo" value="${src.repo}"/> <param name="repo.exists" value="src.repo.exists"/> </antcall> <exec dir="../${TAG}/${src.repo}" executable="git" failonerror="true"> - <arg line="pull"/> + <arg line="fetch"/> + </exec> + <exec dir="../${TAG}/${src.repo}" executable="git" failonerror="true"> + <arg line="reset --hard origin/${TAG}"/> </exec> <antcall target="init_repo"> <param name="repo" value="${bin.repo}"/> <param name="repo.exists" value="bin.repo.exists"/> </antcall> <exec dir="../${TAG}/${bin.repo}" executable="git" failonerror="true"> - <arg line="pull"/> + <arg line="fetch"/> + </exec> + <exec dir="../${TAG}/${bin.repo}" executable="git" failonerror="true"> + <arg line="reset --hard origin/${TAG}"/> </exec> <!--antcall target="init_repo"> <param name="repo" value="${releng.repo}"/> <param name="repo.exists" value="releng.repo.exists"/> </antcall> <exec dir="../${TAG}/${releng.repo}" executable="git" failonerror="true"> - <arg line="pull"/> + <arg line="fetch"/> + </exec> + <exec dir="../${TAG}/${releng.repo}" executable="git" failonerror="true"> + <arg line="reset --><!--hard origin/${TAG}"/> </exec--> </target> <target name="push_remote"> - <antcall target="init_repo"> - <param name="repo" value="${src.repo}"/> - <param name="repo.exists" value="src.repo.exists"/> - </antcall> + <exec dir="../${TAG}/${src.repo}" executable="git" failonerror="true"> + <arg line="fetch"/> + </exec> + <exec dir="../${TAG}/${src.repo}" executable="git" failonerror="true"> + <arg line="rebase origin/${TAG}"/> + </exec> <exec dir="../${TAG}/${src.repo}" executable="git" failonerror="true"> <arg line="push"/> </exec> - <antcall target="init_repo"> - <param name="repo" value="${bin.repo}"/> - <param name="repo.exists" value="bin.repo.exists"/> - </antcall> + <exec dir="../${TAG}/${bin.repo}" executable="git" failonerror="true"> + <arg line="fetch"/> + </exec> + <exec dir="../${TAG}/${bin.repo}" executable="git" failonerror="true"> + <arg line="rebase origin/${TAG}"/> + </exec> <exec dir="../${TAG}/${bin.repo}" executable="git" failonerror="true"> <arg line="push"/> </exec> - <!--antcall target="init_repo"> - <param name="repo" value="${releng.repo}"/> - <param name="repo.exists" value="releng.repo.exists"/> - </antcall> + <!--exec dir="../${TAG}/${releng.repo}" executable="git" failonerror="true"> + <arg line="fetch"/> + </exec> + <exec dir="../${TAG}/${releng.repo}" executable="git" failonerror="true"> + <arg line="rebase origin/${TAG}"/> + </exec> <exec dir="../${TAG}/${releng.repo}" executable="git" failonerror="true"> <arg line="push"/> </exec--> |