From: Peter Baumann <waste.manager@gmx.de>
To: Lars Hjemli <hjemli@gmail.com>
Cc: Eric Wong <normalperson@yhbt.net>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] git-svn: remove --first-parent, add --upstream
Date: Sat, 15 Sep 2007 16:37:43 +0200 [thread overview]
Message-ID: <20070915143743.GB4957@xp.machine.xx> (raw)
In-Reply-To: <8c5c35580709150708k5acdeabdh17fc7ef30ee3eb79@mail.gmail.com>
On Sat, Sep 15, 2007 at 04:08:31PM +0200, Lars Hjemli wrote:
> On 9/7/07, Lars Hjemli <hjemli@gmail.com> wrote:
> > On 9/7/07, Peter Baumann <waste.manager@gmx.de> wrote:
> > > lets reset 'trunk' to its state before the merge and
> > > 'branch1' to the merge commit, before fixing the bug in 'branch1'.
> > >
> > > a-b-c-d-e trunk
> > > \ \
> > > \ -x-y m branch1
> >
> > Yeah, this would certainly not be handled correctly by dcommit using
> > --first-parent (but it could be handled by (a correct implementation
> > of) --upstream).
>
> Actually, I don't think there's any way to handle this correctly. The
> current git-svn will do the right thing except in cases like the one
> you described, and in these cases it can be _forced_ to do the right
> thing by editing the grafts file, so I'll drop the whole --upstream
> idea.
>
What do you mean by editing the graft file? Remove (the wrong) parent
from the merge commit by a graft? This will help you commit on the right
branch, but 7b02b85a66fee6b357e02f9e70dd0baa0fd24308 removes the
possibility to get the same graph back, because now git-svn really
honors the graft in its rebase phase.
So you would get something like this back:
a-b - c - d - e trunk
\
\ -x'-y'- m branch1
Notice that you've lost the merge information :-(
-Peter
next prev parent reply other threads:[~2007-09-15 14:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-05 9:35 [RFC/PATCH] git-svn: add support for --first-parent Lars Hjemli
2007-09-05 10:19 ` Eric Wong
2007-09-06 7:18 ` Lars Hjemli
2007-09-06 7:51 ` Eric Wong
2007-09-06 8:05 ` David Kastrup
2007-09-06 8:34 ` Lars Hjemli
2007-09-06 16:37 ` [PATCH] git-svn: remove --first-parent, add --upstream Lars Hjemli
2007-09-06 17:49 ` Steven Grimm
2007-09-06 21:01 ` Eric Wong
2007-09-06 21:35 ` Eric Wong
2007-09-06 22:14 ` Lars Hjemli
2007-09-06 23:55 ` Peter Baumann
2007-09-07 0:23 ` Lars Hjemli
2007-09-07 8:43 ` Peter Baumann
2007-09-07 10:13 ` Lars Hjemli
2007-09-07 11:51 ` Peter Baumann
2007-09-07 12:08 ` Configure mutt to be used in git and lkml mailing lists (was: Re: [PATCH] git-svn: remove --first-parent, add --upstream) Fernando J. Pereda
2007-09-07 18:37 ` [PATCH] git-svn: remove --first-parent, add --upstream Eric Wong
2007-09-15 14:08 ` Lars Hjemli
2007-09-15 14:37 ` Peter Baumann [this message]
2007-09-15 15:24 ` Lars Hjemli
2007-09-15 15:49 ` Peter Baumann
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070915143743.GB4957@xp.machine.xx \
--to=waste.manager@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hjemli@gmail.com \
--cc=normalperson@yhbt.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).