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

git-svn removes merge

From
JTJoakim Tjernlund <joakim.tjernlund@transmode.se>
Date
Jun 7, 2007, 17:08 UTC
Message-ID
<1181236096.30670.66.camel@gentoo-jocke.transmode.se>
If I do this:

git checkout --track -b svn remotes/trunk git checkout -b merge git-am ../mbox git checkout svn #edit Makefile and commit git-svn dcommit #Note 1 git pull . merge git-svn dcommit

then git-svn dcommit removes the merge beteen svn and merge. git log svn..merge shows all the commits that git-am ../mbox added.

How do I avoid this?
 Jocke
Note 1:
  If I skip this step then the last git-svn dcommit fails, why is that?
Next: Joakim Tjernlund
Message 1 of 2 in “git-svn removes merge”
  1. Joakim TjernlundJun 7, 2007
  2. Joakim TjernlundJun 8, 2007

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.