Re: interactive rebase not rebasing

From: Andreas Ericsson <ae@op5.se>
Date: Oct 1, 2008, 21:26 UTC
Message-ID: <48E3EAE9.5070207@op5.se>
In-Reply-To: <20081001121321.5761fc7e.stephen@exigencecorp.com>

Stephen Haberman wrote:

Show 9 quoted lines

>>> I've attempted to do that. Now that I sent in the patch, if you could
>>> review it, I would appreciate your feedback.
>> I'm heading home from work now. I'll look it over tonight or tomorrow
>> morning.
> 
> Cool, thanks.
> 
> Question: how taboo is it to just add another test file?
>

Not so taboo. Especially not if there are compelling technical reasons not to add stuff to an existing one.

Show 7 quoted lines

> I'm attempting to integrate my test into t3404, which is the existing
> interactive rebase test. The two test_expect_success's I added worked
> when I ran them at the start of the test and then reset --hard the
> branches back for the other tests, but if I paste my tests where they
> should probably be, in the middle after the other -p tests, they break
> because the 10 or tests before this have screwed with the DAG already.
>

Where you add the tests doesn't matter much. Many tests are grouped by feature simply because they were added along with the feature they're testing. There's no other value of grouping tests together.

> I can suffer through getting it to work, but a t3409 would be much
> easier, and probably easier to read as well as a I could setup my own
> DAG instead of hacking onto 3404s.
>

t3409 is already in spearce.git's next branch. You should be able to add stuff to that, or add t3410 if that doesn't work so good.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231