From: Steven Grimm <koreth@midwinter.com>
To: Kees-Jan Dijkzeul <k.j.dijkzeul@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Fwd: git-svn dcommit fail
Date: Thu, 05 Jul 2007 09:18:54 -0700 [thread overview]
Message-ID: <468D19EE.6@midwinter.com> (raw)
In-Reply-To: <fa0b6e200707050406i831816co80ff1500dae6bf54@mail.gmail.com>
Kees-Jan Dijkzeul wrote:
> Basically, the problem is as follows: My head commit is a merge:
> $ git show HEAD
> commit e135f26dbae66f539b486646a12aa51e71c196a1
> Merge: bb8ac98... f453e1e...
>
> Both parents are svn-commits.
That seems to be a case that the current merge support in git-svn can't
handle. I'll refer you to the test I did when the merge support first
landed on the mailing list:
http://www.spinics.net/lists/git/msg33628.html
The current code seems to be aimed at using branches for local
development on the git side rather than dealing with relationships
between multiple svn branches.
I'll also point out this utility, which may be of use to you. It is not
perfect but it works.
http://www.spinics.net/lists/git/msg29119.html
-Steve
prev parent reply other threads:[~2007-07-05 16:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-04 9:56 git-svn dcommit fail Dongsheng Song
2007-07-05 7:11 ` Steven Grimm
[not found] ` <fa0b6e200707050126m17a23de6uad4909533306eb06@mail.gmail.com>
2007-07-05 8:28 ` Fwd: " Kees-Jan Dijkzeul
2007-07-05 8:47 ` Junio C Hamano
2007-07-05 11:06 ` Kees-Jan Dijkzeul
2007-07-05 16:18 ` Steven Grimm [this message]
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=468D19EE.6@midwinter.com \
--to=koreth@midwinter.com \
--cc=git@vger.kernel.org \
--cc=k.j.dijkzeul@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).