git-svn and rebase causes duplicate log entries in svn

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]