[DRE-commits] [SCM] pkg-ruby-extras.git branch, master, updated. 49647dfef52a85acf58acd8fac8624dc609f6fbd

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit f12153561dce1f800e1ae20faeb87a8a831674fa
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Tue Sep 13 19:36:51 2011 -0700

    more sophisticated way of updating local repos

diff --git a/make-mrconfig b/make-mrconfig
index ab87099..9a58c75 100755
--- a/make-mrconfig
+++ b/make-mrconfig
@@ -42,13 +42,20 @@ 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
+          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; }
       }
 "
 
@@ -56,11 +63,12 @@ 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