threads / discuss / 43272

git-svn and rebase causes duplicate log entries in svn

Subject: git-svn and rebase causes duplicate log entries in svn

## tl;dr

3 messages between Nov 14, 2006 and Nov 15, 2006.

replies: 2people: 2as markdown or json

Joakim Tjernlund· Nov 14, 2006, 21:49 UTC · lore

I have my own u-boot tree with a local branch where I do my own development. This this branch(called svn) is connected to a svn repo using git-svn.

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: ------------------------------------------------------------------------ r321 | jocke | 2006-11-14 09:45:14 +0100 (Tue, 14 Nov 2006) | 2 lines

Add install of HRCW into I2C EEPROM.

and here: ------------------------------------------------------------------------ r46 | jocke | 2006-11-13 19:09:19 +0100 (Mon, 13 Nov 2006) | 2 lines

Add install of HRCW into I2C EEPROM.

Any way to avoid that?

Question, I found that 
  git-svn fetch && git-rebase remotes/git-svn^2 svn
leaves the svn branch at the tip of my latest commit in the
svn branch which makes better sense to me then
  git-svn fetch && git-rebase remotes/git-svn svn
which puts svn at HEAD of remotes/git-svn.

Any reason I should not do the ...-svn^2 variant?

I am using git 1.4.3.5 and subversion 1.4.0

Seth Falcon· Nov 14, 2006, 22:55 UTC · re: Joakim Tjernlund · lore

Re: git-svn and rebase causes duplicate log entries in svn

Hi Joakim,

"Joakim Tjernlund" <joakim.tjernlund@transmode.se> writes:

Show 7 quoted lines

> 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.

Joakim Tjernlund· Nov 15, 2006, 10:14 UTC · re: Seth Falcon · lore

Re: git-svn and rebase causes duplicate log entries in svn

Seth Falcon wrote:

Show 27 quoted lines

> 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.
>
> + seth
>

Thanks, but for some reson I can't make dcommit work. I just get git-svn dcommit -q remotes/git-svn..svn Unable to extract revision information from commit 3643783f1f2fbdec1514b5e842e97b27622ae8b8~1

My workflow is perhaps a little diffrent I do all dev in git and then
commit to SVN.
I start with creating an empty SVN tree and then do a
   git-svn commit <commit id where my dev started from u-boot>
then I do a
   git-svn commit  -q remotes/git-svn..svn
to add all my own commits.