[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: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 4 Sep 2009 11:24:18 +0100

On Thu, Sep 03, 2009 at 08:40:39PM -0500, 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.
> </rant>

There is some basic tree conflict testing in both update_tests.py
and merge_tests.py. Now we're adding more advanced tree conflict
testing to merge_test.py :)

We also have tree_conflict_tests.py, which concerns itself with
some switch stuff and with testing things in situations where
the tree conflict has already happened.
We could move all tests that specifically test tree-conflict
handling there. But if we do this, let's also move the update
tests for consistency.


Received on 2009-09-04 12:25:21 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.