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

From: Steven Grimm <koreth@midwinter.com>
Date: Jun 27, 2007, 16:57 UTC
Message-ID: <468296DE.7000704@midwinter.com>
In-Reply-To: <1182947236.21320.3.camel@omicron.ep.petrobras.com.br>

Victor Bogado da Silva Lins wrote:

> I will try that, but on the other hand is it possible to commit the 
> diff between my head and the svn head with a new message? This would 
> be good enough for me.

Yes, that's pretty easy; you just have to do a squash merge to eliminate the nonlinear history. Assuming the svn head is called "trunk" and your head is called "myhead":

# start with the svn head git checkout -b trunk tempbranch # bring in all the changes from your branch git merge --squash myhead # commit with whatever message you want git commit # and ship it up to svn land git svn dcommit

-Steve