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

Re: git-svn error "Unable to extract revision information from commit ...~1"

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 27, 2007, 02:20 UTC
Message-ID
<7vfy4ervdg.fsf@assigned-by-dhcp.pobox.com>
In-Reply-To
<4681C27B.8040009@midwinter.com>
Steven Grimm <koreth@midwinter.com> writes:
Show 18 quoted lines
> Victor Bogado da Silva Lins wrote:
>> The problem seem to be that when I merge the head with another branch
>> git-svn does not know where to follow to meet the "svn trunk".
>
> The current release of git-svn doesn't support committing merges. It
> has no clue how to walk nonlinear history, as you point out. The
> current practice is to do "git merge --squash" when merging into the
> git-svn branch that you want to use as the basis for your svn
> commit. The --squash option will make git merge the contents of the
> other branch(es) but record the resulting tree as a regular commit,
> not as a merge.
>
> There is a work-in-progress patch which might help you if you need to
> preserve merge ancestry on the git side. Search the mailing list
> archives for "[PATCH] git-svn: allow dcommit to retain local merge
> information" if you want to try it (but be aware that it is just an
> initial implementation and may have bugs; it was posted so people
> could try it out and report back any problems to the author.)
... which has been cooking in 'next' for the past two weeks.
Previous: Steven GrimmNext: Steven Grimm
Message 3 of 5 in “git-svn error "Unable to extract revision information from commit ...~1"”
  1. Victor Bogado da Silva LinsJun 26, 2007
  2. Steven GrimmJun 27, 2007
  3. Junio C HamanoJun 27, 2007
  4. Steven GrimmJun 27, 2007
  5. Steven GrimmJun 27, 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.