From: Steven Grimm <koreth@midwinter.com>
To: Dongsheng Song <dongsheng.song@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git-svn dcommit fail
Date: Thu, 05 Jul 2007 00:11:24 -0700 [thread overview]
Message-ID: <468C999C.60701@midwinter.com> (raw)
In-Reply-To: <4b3406f0707040256x31f0909cie126d950c60374f1@mail.gmail.com>
Dongsheng Song wrote:
> After some merge operation,
git-svn doesn't support nonlinear history in any of the official
releases, though there will be some support in the next release (you can
try it out by grabbing the latest version from git.git's master branch).
If you don't want to run a prerelease version of git, you need to avoid
doing non-squash merges into branches that you are going to check into
an svn repository.
Squash merges (git merge --squash) work fine, though. They will be
recorded in your history as a regular commit, not a merge, so git-svn
won't be confused by them.
-Steve
next prev parent reply other threads:[~2007-07-05 7:11 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 [this message]
[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
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=468C999C.60701@midwinter.com \
--to=koreth@midwinter.com \
--cc=dongsheng.song@gmail.com \
--cc=git@vger.kernel.org \
/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).