Changes between Version 11 and Version 12 of GitMirror

Timestamp:

02/26/09 18:14:00 (4 years ago)

Author:

pv

Comment:

Update according to the cleaner git mirror branch layout

GitMirror

@@ -25 +25 @@
 This needs to be done only once.
 {{{
-git clone git://github.com/pv/scipy-svn.git scipy.git
+git clone --origin svn git://github.com/pv/scipy-svn.git scipy.git
 }}}
 This will take some time, as the repository (ca. 30 MB) contains Scipy's whole history.
 
-Then, get the SVN branch pointers. First, edit `scipy.git/.git/config` and change
-the `remote "origin"` section to look like this:
-{{{
-[remote "origin"]
-        url = git://github.com/pv/scipy-svn.git
-        fetch = +refs/remotes/*:refs/remotes/*
-        fetch = +refs/heads/*:refs/remotes/origin/*
-}}}
-Then run
-{{{
-git fetch
-}}}
-`XXX: this is mildly ugly, we can investigate if it's possible to streamline this`
-
 Now you can do
 {{{
-git log trunk
+git log svn/trunk
 }}}
 to view the commit log of Scipy's trunk. Or, list branches and tags in SVN:
@@ -57 +43 @@
 to commit your changes back to SVN.
 {{{
-git-svn init -s http://svn.scipy.org/svn/scipy
+git-svn init -s --prefix=svn/ http://svn.scipy.org/svn/scipy
 git-svn rebase -l
 }}}
@@ -72 +58 @@
 {{{
 # Make a branch 'work' based on trunk, and switch to it
-git checkout -b work trunk
+git checkout -b work svn/trunk
 }}}
 You can list available branches with
@@ -102 +88 @@
 If you haven't published your changes, you can just use rebase:
 {{{
-git rebase trunk
+git rebase svn/trunk
 }}}
 If there are conflicts, it will ask you to resolve them. After
@@ -111 +97 @@
 An alternative is merging, which does not rewrite history,
 {{{
-git merge trunk
+git merge svn/trunk
 }}}
 `XXX: but committing changes back using git-svn may be more hairy if there are merges? Also, you get duplicate commits, since SVN cannot contain merge commits`
@@ -160 +146 @@
 Examine what was done there:
 {{{
-git log trunk..
-git diff trunk
+git log svn/trunk..
+git diff svn/trunk
 git show bb21c
 git show 7f738
@@ -213 +199 @@
 git svn dcommit -n
 }}}
+
+If you want to view a diff of the changes to be committed, use this script:
+{{{
+#!/bin/bash
+git svn dcommit -n | { read; while read X; do git $X  -M -C --pretty --stat -p; done } | less
+}}}
+Save it somewhere in your `$PATH` as `git-show-dcommit` and make it executable.
+Then, you can do `git show-dcommit` to view what is to be committed.