From: Peter Baumann <waste.manager@gmx.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: git@vger.kernel.org
Subject: Re: Git and svn as target
Date: Thu, 10 Jun 2010 08:05:25 +0200 [thread overview]
Message-ID: <20100610060525.GA2177@m62s10.vlinux.de> (raw)
In-Reply-To: <4C107BEB.6020209@fechner.net>
On Thu, Jun 10, 2010 at 07:45:15AM +0200, Matthias Fechner wrote:
> Hi,
>
> i started now to work with git instead of svn. The main repository
> is a svn repo so i use git svn ...
>
> But I have the problem now, commit comments are not transfered to
> svn, maybe I miss here a parameter.
>
> What i did:
> git svn fetch
> git svn rebase
> git branch test
> git checkout test
> several commits
> git checkout master
> git svn fetch
> git svn rebase
> git merge test
> git svn dcommit
>
> In the commit of svn I see only merged test...
> Could I say git to put all the commit comments into the merge?
>
AFAIK git svn doesn't handle git merges very well. If you rebase your test branch onto
master and then do the git-svn dcommit, everything should work as expected.
-Peter
next prev parent reply other threads:[~2010-06-10 6:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-10 5:45 Git and svn as target Matthias Fechner
2010-06-10 6:05 ` Peter Baumann [this message]
2010-06-10 7:11 ` Avery Pennarun
2010-06-14 16:35 ` Matthias Fechner
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=20100610060525.GA2177@m62s10.vlinux.de \
--to=waste.manager@gmx.de \
--cc=git@vger.kernel.org \
--cc=idefix@fechner.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.