All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven Grimm <koreth@midwinter.com>
To: Victor Bogado da Silva Lins <victor@bogado.net>
Cc: git@vger.kernel.org
Subject: Re: git-svn error "Unable to extract revision information from commit ...~1"
Date: Tue, 26 Jun 2007 18:50:51 -0700	[thread overview]
Message-ID: <4681C27B.8040009@midwinter.com> (raw)
In-Reply-To: <1182884957.16012.31.camel@omicron.ep.petrobras.com.br>

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.)

-Steve

  reply	other threads:[~2007-06-27  1:52 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 [this message]
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
     [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=4681C27B.8040009@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.