[DRE-commits] [SCM] pkg-ruby-extras.git branch, master, updated. 38960931242826f0ae9150ad01d0cf61334654ca

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 7154da0363034df4af59fd69f4dba18c15c931e4
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Wed Sep 14 08:32:15 2011 -0700

    Revert "more sophisticated way of updating local repos"
    
    This reverts commit f12153561dce1f800e1ae20faeb87a8a831674fa.

diff --git a/make-mrconfig b/make-mrconfig
index 9a58c75..ab87099 100755
--- a/make-mrconfig
+++ b/make-mrconfig
@@ -42,20 +42,13 @@ lib=
         echo \"I: \$1\"
       }
       git_checkout () {
-          git clone git+ssh://git.debian.org$GIT_REPODIR\$1.git &&
-          cd \$1 &&
-          { git branch --track upstream remotes/origin/upstream || true; } &&
-          { git branch --track pristine-tar remotes/origin/pristine-tar || true; }
+        git clone git+ssh://git.debian.org$GIT_REPODIR\$1.git &&
+        cd \$1 &&
+        { git branch --track upstream remotes/origin/upstream || true; } &&
+        { git branch --track pristine-tar remotes/origin/pristine-tar || true; }
       }
       svn_checkout () {
-          svn co $SVN_REPODIR/\$1
-      }
-      git_update () {
-          cd \$1 &&
-          git fetch origin &&
-          { git checkout upstream && git merge origin/upstream || true; } &&
-          { git checkout pristine-tar && git merge origin/pristine-tar || true; } &&
-          { git checkout master && git merge origin/master || true; }
+        svn co $SVN_REPODIR/\$1
       }
 "
 
@@ -63,12 +56,11 @@ lib=
 for i in $GIT_PKGS; do
     output "[$i]
 checkout = git_checkout $i
-update = git_update $i
 "
 done
 
 for i in $GIT_PKGS; do
-  echo $i
+	echo $i
 done > .gitignore
 cat >> .gitignore <<EOF
 .mrconfig~

-- 
pkg-ruby-extras.git