Re: [PATCH] git-svn: remove --first-parent, add --upstream

From: Lars Hjemli <hjemli@gmail.com>
Date: Sep 15, 2007, 14:08 UTC
Message-ID: <8c5c35580709150708k5acdeabdh17fc7ef30ee3eb79@mail.gmail.com>
In-Reply-To: <8c5c35580709070313l4b815ddbg70be8fb0aef4eefd@mail.gmail.com>

On 9/7/07, Lars Hjemli <hjemli@gmail.com> wrote:

Show 11 quoted lines

> 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.

-- larsh