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

From: Lars Hjemli <hjemli@gmail.com>
Date: Sep 7, 2007, 10:13 UTC
Message-ID: <8c5c35580709070313l4b815ddbg70be8fb0aef4eefd@mail.gmail.com>
In-Reply-To: <20070907084352.GD4538@xp.machine.xx>

On 9/7/07, Peter Baumann <waste.manager@gmx.de> wrote:

Show 6 quoted lines

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

Thanks for the example, I had a feeling something like this could occur. So I guess I'll have another go at --upstream this weekend.

[btw: could you please stop messing with 'Mail-Followup-To:'? When replying to your mail, I don't want everyone _except_ you in the 'To:' header...]

-- larsh