From: Thomas Rast <trast@student.ethz.ch>
To: "Nico -telmich- Schottelius" <nico-linux-git@schottelius.org>
Cc: David Mann <mannd@epstudiossoftware.com>, git@vger.kernel.org
Subject: Re: question re dcommit problem
Date: Fri, 30 Jan 2009 22:43:54 +0100 [thread overview]
Message-ID: <200901302243.57996.trast@student.ethz.ch> (raw)
In-Reply-To: <20090130084253.GA30046@denkbrett.schottelius.org>
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
Nico -telmich- Schottelius wrote:
> David Mann [Thu, Jan 29, 2009 at 07:14:08PM -0500]:
> > I created a git repository from my svn repository, later uploaded it to
> > GitHub, and after some branching and merging, can no longer dcommit back
> > to the svn repository. [...]
>
> Iirc git svn does not support merges. You've to use git rebase or
> update through the svn server.
It does support them on the git side. To SVN, the merge should look
like the squashed result (along the first-parent line). On your local
git end, it should rebase the merge (to allow for git-svn-id) but
preserve parents, thus keeping history.
However, it is very important that the SVN line of history is always
reachable along the first-parent line. David, did you ensure that?
--
Thomas Rast
trast@{inf,student}.ethz.ch
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
prev parent reply other threads:[~2009-01-30 22:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-30 0:14 question re dcommit problem David Mann
2009-01-30 8:42 ` Nico -telmich- Schottelius
2009-01-30 21:43 ` Thomas Rast [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=200901302243.57996.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=mannd@epstudiossoftware.com \
--cc=nico-linux-git@schottelius.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).