git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git-svn and rebase causes duplicate log entries in svn

From
JTJoakim Tjernlund <joakim.tjernlund@transmode.se>
Date
Nov 14, 2006, 21:49 UTC
Message-ID
<00ff01c70836$ba7e3d00$1e67a8c0@Jocke>

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
Next: Seth Falcon
Message 1 of 3 in “git-svn and rebase causes duplicate log entries in svn”
  1. Joakim TjernlundNov 14, 2006
  2. Seth FalconNov 14, 2006
  3. Joakim TjernlundNov 15, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.