Thanks for the recipe, Konstantin.

The main thing I'm trying to achieve at the moment is to create an
initial setup I can build on, not put a lot of work into a setup I need
to revert out of because I made a mistake in understanding how git(-svn)
works.

On 01/02/11 23:07, Konstantin Khomoutov wrote:

> Hence, the course of action for you would probably be:
> 1) Prepare the authors file.
> 2) git-svn clone the Subversion repo.
> 3) Fork its master branch to your two local branches.

Is there a best way to do the fork? For longstanding branches I guess a
cp -r would be better than a git branch?

> 4) Add another two remotes (the first one will be "svn", created by git-svn)
>    which you will use to do pushes to your staging and production
>    servers.

I don't follow this step - why does one of the remotes need to be svn,
not pure git?

> 5) When needed, `git svn fetch` the changes from the Subversion repo
>    then switch to each of your local branches in turn and do `git rebase
>    master` in them.

Fine

> 6) How to push to the staging and production servers is really beyond
>    this question as it depends on your requirements and taste.
> 

Sure.

> Having multiple developers working with you *might* require that you
> have only one box which does fetching from the Subversion repo and then
> pushes the resulting changes in the tracking branch to some server, and
> everyone else fetches from there. 

OK, makes sense.

Thanks
Graham

This might be necessary as fetching
> from Subversion *creates* Git commit objects, and this process depends
> on local settings (including the authors file, if used) -- having
> different local settings might result in creation of commits which hash
> to different SHA-1 hashes for the same Subversion revisions, and this
> obviously breaks the idea central to Git of identical objects having
> identical hashes.
> 
> 1. http://wiki.debian.org/Alioth/Git#ConvertaSVNAliothrepositorytoGit
> 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to