[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: replace vs. delete causing TC

From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Sat, 05 Sep 2009 22:57:53 +0200

Hyrum K. Wright wrote:
> On Sep 3, 2009, at 7:50 PM, Neels Janosch Hofmeyr wrote:
>
>> Hi tree-conflicts folks,
>>
>> if you might, take a look at merge_tests.py 135
>> (merge_replace_causes_tree_conflict2) in r39132.
>
> <rant>
> 135 tests in merge_tests.py is starting to look like it has jumped the
> shark. Is merge test 135 really testing merge, or is it testing some
> other functionality which happens to use merge? merge_tests.py
> already takes forever to complete, is there some way we can break the
> file up into multiple (logical) pieces?
>
> That is all.

Well, 135 tests a merge in which a replace goes on top of a local delete. I
think it's fairly straightforward to see the relation to merge_tests.py. But
in the same way, 135 validates tree-conflict behavior of merge.

We could move all tree-conflicts related tests to tree_conflict_tests.py.
Then, tree_conflict_tests.py would contain all sorts of tests where actually
update, switch, merge, revert and commit are tested. -- But I'd expect that
if I change the merge code, I run first of all merge_tests.py to check
whether I've broken any merge corners, including TC merges...

So I guess it's fine. Moving to another file has zero benefit for a `make
check'. Keeping merge related things grouped is Good. right?

I personally wouldn't veto someone moving all the TC tests to
tree_conflict_tests.py, either. (see notes/tree-conflicts/all-tests.sh for
all TC tests known at r37951.)
> </rant>

~Neels

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2391344

Received on 2009-09-05 23:01:18 CEST

This is an archived mail posted to the Subversion Dev mailing list.