Re: core-git and porcelains

From: Shawn Pearce <spearce@spearce.org>
Date: Oct 11, 2006, 16:54 UTC
Message-ID: <20061011165403.GC31298@spearce.org>
In-Reply-To: <egj73t$80e$1@sea.gmane.org>

Pazu <pazu@pazu.com.br> wrote:

Show 12 quoted lines

> Shawn Pearce wrote:
> 
> >I would just stick with core Git.  I haven't used Cogito in almost
> >a year so I can't say what I'm missing there, but core Git works
> >very well for all of my needs.  I use it in a lot of different
> >projects, some which require git-svn, others which require some
> >bastard git-svn-workalike for non-SVN systems, and others which
> >are just Git projects and don't have to cooperate with others.
> 
> Thanks for the advice, Shawn. Would you mind expanding on how you work 
> with git-svn, however? Specially, how's your everyday work, and how do 
> you deal with multiple upstream branches.

I don't use multiple upstream branches in SVN fortunately, but the git-svn documentation suggests there is a way to change the Git branch name from 'refs/remotes/git-svn' to another name such that you can create one Git branch for each remote SVN branch. Of course you need to set that environment variable before invoking git-svn.

As for my daily work with git-svn, I run "git svn fetch" to fetch any changes that had occurred in SVN along the branch I follow, then if any changes did exist I merge them into my Git working branch with "git pull . refs/remotes/git-svn". When I'm ready to send stuff back up to SVN I do "git svn dcommit refs/remotes/git-svn..master", where master is the name of the Git branch I want to send.

-- 
Shawn.