Simplify procedure to update upstream branch

ffeeb901 · Julien Muchembled · a8a872ea · ffeeb901
Commit ffeeb901 authored May 26, 2011 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

00.REPOSITORY.README.txt 00.REPOSITORY.README.txt +3 -7

No files found.
--- a/00.REPOSITORY.README.txt
+++ b/00.REPOSITORY.README.txt
@@ -14,14 +14,10 @@ upstream is clone of all http://svn.zope.org/repos/main/zc.buildout/trunk
 commits, it is updated from time to time by using (NOTE: Still work in progress):

 git clone
-Put in .git/config:
+git svn init --no-minimize-url -T http://svn.zope.org/repos/main/zc.buildout/trunk
+git update-ref refs/remotes/trunk origin/upstream

-[svn-remote “svn”]
-url = http://svn.zope.org/repos/main/zc.buildout/trunk
-fetch = :refs/remotes/git-svn
-
-git show origin/upstream | head -n 1 | cut -d ‘ ’ -f 2 > .git/refs/remotes/git-svn
-git show origin/upstream | head -n 1 | cut -d ‘ ’ -f 2 > .git/refs/remotes/trunk
+git checkout -b upstream origin/upstream # or git checkout upstream
 git svn rebase
 git push