From: Felipe Contreras Date: Sun, 09 Jun 2013 17:46:07 GMT Subject: Re: [PATCH v4 42/45] add tests for rebasing merged history Message-ID: In-Reply-To: <87obbfchqb.fsf@hexa.v.cablecom.net> On Sun, Jun 9, 2013 at 12:32 PM, Thomas Rast wrote: > Felipe Contreras writes: > >> On Sun, Jun 9, 2013 at 12:25 PM, Thomas Rast wrote: >>> Felipe Contreras writes: >>> >>>> +#TODO: make order consistent across all flavors of rebase >>>> +test_run_rebase success 'd e n o' '' >>>> +test_run_rebase success 'd e n o' -m >>>> +test_run_rebase success 'd n o e' -i >>> >>> [45/45] would seem to imply that these tests fail as of this patch. Is >>> that correct? >>> >>> If so, please either squash that change or move the test further up >>> marked as 'failure'. >> >> I won't. The whole purpose of the last patch is to show these tests are fixed. >> >> Martin von Zweigbergk's patch series is independent of this one, I >> merely added it to show the above. > > So you would deliberately break a bisection on this test file? No, this patch series won't be applied. -- Felipe Contreras