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

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

From
Seth Falcon <sethfalcon@gmail.com>
Date
Nov 14, 2006, 22:55 UTC
Message-ID
<m2zmatiqon.fsf@ziti.local>
In-Reply-To
<00ff01c70836$ba7e3d00$1e67a8c0@Jocke>
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.

Previous: Joakim TjernlundNext: Joakim Tjernlund
Message 2 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.