From 7ec44aefeae3f43473a7b34cd58ed3b83548c7fe Mon Sep 17 00:00:00 2001 From: Eric Berberich Date: Sun, 1 May 2011 19:35:04 +0000 Subject: [PATCH] update --- Scripts/developer_scripts/cgal_git_svn_clone | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Scripts/developer_scripts/cgal_git_svn_clone b/Scripts/developer_scripts/cgal_git_svn_clone index f99c582c625..c9b8c120923 100755 --- a/Scripts/developer_scripts/cgal_git_svn_clone +++ b/Scripts/developer_scripts/cgal_git_svn_clone @@ -24,9 +24,9 @@ userName="Eric Berberich" userEmail=eric@mpi-inf.mpg.de userLogin=eric svnGforge=svn+ssh://$userLogin@scm.gforge.inria.fr/svn/cgal -fromSvn=file://$HOME/CGAL/gforge/cgal-m -#fromSvn=$svnGforge -fromRev=63050 +#fromSvn=file://$HOME/CGAL/gforge/cgal-m +fromSvn=$svnGforge +fromRev=1 gitName=cgal.git skipTags=0 skipFetch=0 @@ -174,11 +174,15 @@ if [ $skipFetch = 0 ]; then if [ "$cloneLocation" != "" ]; then - echo "Rebase from SVN server" + echo "Fetch from real SVN server" + git svn fetch + + echo "Checkout 'local/next'" + git checkout local/next + + echo "Rebase from real SVN server" git svn rebase - - else ### Authors file