If you don't "git reset --hard" to create master, then the "git svn rebase" step fails. Also add "-s" to use a satandard layout, and remove the bogus '=' from the "git config" step. Signed-off-by: Peter <git@xxxxxxxxxxxxxxxxxxx> --- Documentation/git-svn.txt | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index f94d0f9..b293a66 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -455,16 +455,18 @@ have each person clone that repository with 'git clone': ------------------------------------------------------------------------ # Do the initial import on a server - ssh server "cd /pub && git svn clone http://svn.foo.org/project + ssh server "cd /pub && git svn clone -s http://svn.foo.org/project # Clone locally - make sure the refs/remotes/ space matches the server mkdir project cd project git init git remote add origin server:/pub/project - git config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/* + git config --add remote.origin.fetch +refs/remotes/*:refs/remotes/* git fetch # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) - git svn init http://svn.foo.org/project + git svn init -s http://svn.foo.org/project +# Check out the svn branch you want to work on + git reset --hard trunk # Pull the latest changes from Subversion git svn rebase ------------------------------------------------------------------------ -- 1.5.3.7 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
