Re: git-svn and distributed git

On Jul 31, 2007, at 12:42, Väinö Järvelä wrote:

I have thought about using two branches on the server, master,  
which will only include commits already processed through git-svn,  
and dev, which is used to pull the "local" changes to be committed  
to Subversion. But my inexperience with git got me here, and I  
can't seem to be able to get any updates from the other branch. And  
I'm not even sure if this is the right approach to this problem.

I got the branched situation to work. I was just pushing and pulling  
wrong when it didn't work. I guess I didn't understand the  
documentation well enough to fiddle around with remotes.

I got the branching to work with simple commands:
server$ git push origin dev
laptop$ git pull server dev
laptop$ git-svn dcommit && git push server && git branch -r -d dev
server$ git checkout master && git pull origin && git branch -D dev

But that's a lot of commands, am I still missing something with the  
branching?


Regards,
Väinö