From: Seth Falcon <sethfalcon@gmail.com>
Date: Tue, 14 Nov 2006 22:55:36 GMT
Subject: Re: git-svn and rebase causes duplicate log entries in svn
Message-ID: <m2zmatiqon.fsf@ziti.local>
In-Reply-To: <00ff01c70836$ba7e3d00$1e67a8c0@Jocke>

Hi Joakim,

"Joakim Tjernlund" <joakim.tjernlund@transmode.se> writes:
> Now I want to rebase my svn branch against latest u-boot and commit
> my rebased svn branch to svn.
>
> I use git-svn commit -b svn -q remotes/git-svn..svn to commit my latest
> changes and when I do so I see my local changes once more in the svn
> log:
> Any way to avoid that?

I think you want to use git-svn dcommit, and not commit.  See the
notes in the git-svn man page.  The basic workflow
that I've been using is:

git-svn fetch  
git rebase remotes/git-svn  ## on mybranch
## make commits on mybranch
git-svn dcommit remotes/git-svn..mybranch

This results in each commit that I made on mybranch being sent to svn
as a separate commit.