From: Martin von Zweigbergk <martinvonz@gmail.com>
Date: Fri, 31 May 2013 05:42:46 GMT
Subject: Re: [PATCH v2 5/7] add tests for rebasing merged history
Message-ID: <CANiSa6gK99W=x-RXmgxqZ+UFJbps2nu0S_RApD2hAiQU2wgnQg@mail.gmail.com>
In-Reply-To: <51A5B4E1.3070205@viscovery.net>

On Wed, May 29, 2013 at 12:57 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
>> +# a---b-----------c
>> +#      \           \
>> +#       d-------e   \
>> +#        \       \   \
>> +#         n---o---w---v
>> +#              \
>> +#               z
>
>> +#TODO: make all flavors of rebase use --topo-order
>> +test_run_rebase success 'e n o' ''
>> +test_run_rebase success 'e n o' -m
>> +test_run_rebase success 'n o e' -i
>
> As test_commit offers predictable timestamps, I think you can work around
> this discrepancy by generating commits n and o before e. (That is not a
> solution--just a workaround that depends on the current
> implementation--because the order in which parents of a merge are listed
> is unspecified.)

I actually liked it as documentation of the current inconsistency and
with an explicit TODO.

I have addressed the remainder of your comments in this and the next
message. Thanks again.