From: Steven Grimm <koreth@midwinter.com>
To: Victor Bogado da Silva Lins <victor@bogado.net>
Cc: 'git' <git@vger.kernel.org>
Subject: Re: git-svn error "Unable to extract revision information from commit ...~1"
Date: Wed, 27 Jun 2007 09:57:02 -0700 [thread overview]
Message-ID: <468296DE.7000704@midwinter.com> (raw)
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
next prev parent reply other threads:[~2007-06-27 16:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-26 19:09 git-svn error "Unable to extract revision information from commit ...~1" Victor Bogado da Silva Lins
2007-06-27 1:50 ` Steven Grimm
2007-06-27 2:20 ` Junio C Hamano
[not found] ` <1182947236.21320.3.camel@omicron.ep.petrobras.com.br>
2007-06-27 16:57 ` Steven Grimm [this message]
[not found] ` <e2a1d0aa0706271031n3191a27fi41ca5ba3f14c3a51@mail.gmail.com>
2007-06-27 20:25 ` Steven Grimm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=468296DE.7000704@midwinter.com \
--to=koreth@midwinter.com \
--cc=git@vger.kernel.org \
--cc=victor@bogado.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.