Thread (1 message) 1 message, 1 author, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:18

Steven Grimm [off-list ref] writes:
Victor Bogado da Silva Lins wrote:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help