Re: [PATCH] tree-conflicts: fix some tests, was Re: tree-conflicts: patch for improved cmdline tests

Neels Hofmeyr wrote:
> :O
> I was so sure I had grep'd for every function I removed.
>
> I investigated and found that all remaining calls of set_up_tree_conflicts()
> are less advanced. They just need some tree-conflict markings in a working copy.
>
> So, I simplified it to deliver that, also removing code repetition from the
> callers.

Thanks, Neels.

I tweaked the log message a bit, and tweaked the function
build_greek_tree_conflicts() just to replace long-hand lists of expected
status with calls to get_virginal_state().

> I renamed it to build_greek_tree_conflicts(), because:
>
> - The new function builds a working copy with tree-conflicts, instead of
> only preparing for them. Hence the "build" annotation.
>
> - I found the name too absolute, since there are other tree-conflicts test
> setups around. Hence the "greek" annotation.

That's great.

Committed in r32806.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-29 14:53:56 CEST