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

Re: Fwd: git-svn dcommit fail

From
Steven Grimm <koreth@midwinter.com>
Date
Jul 5, 2007, 16:18 UTC
Message-ID
<468D19EE.6@midwinter.com>
In-Reply-To
<fa0b6e200707050406i831816co80ff1500dae6bf54@mail.gmail.com>
Kees-Jan Dijkzeul wrote:
Show 6 quoted lines
> Basically, the problem is as follows: My head commit is a merge:
> $ git show HEAD
> commit e135f26dbae66f539b486646a12aa51e71c196a1
> Merge: bb8ac98... f453e1e...
>
> Both parents are svn-commits.

That seems to be a case that the current merge support in git-svn can't handle. I'll refer you to the test I did when the merge support first landed on the mailing list:

http://www.spinics.net/lists/git/msg33628.html

The current code seems to be aimed at using branches for local development on the git side rather than dealing with relationships between multiple svn branches.

I'll also point out this utility, which may be of use to you. It is not perfect but it works.

http://www.spinics.net/lists/git/msg29119.html
-Steve
Previous: Kees-Jan Dijkzeul
Message 6 of 6 in “git-svn dcommit fail”
  1. Dongsheng SongJul 4, 2007
  2. Steven GrimmJul 5, 2007
  3. Fwd: git-svn dcommit failKees-Jan Dijkzeul, Jul 5, 2007
  4. Junio C HamanoJul 5, 2007
  5. Kees-Jan DijkzeulJul 5, 2007
  6. Steven GrimmJul 5, 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.