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

Re: tree-conflicts: all tests

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Sat, 18 Oct 2008 23:22:56 +0200

Stephen Butler wrote:
> Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:
>
>> Hi tree-conflicts folks,
>>
>> are these all the tree-conflicts tests?
>>
>> ./update_tests.py 46-50
>> ./switch_tests.py 31-35
>> ./merge_tests.py 101-103 111-121
>> ./update_tests.py 1
>
> typo? I think you meant
>
> ./info_tests.py 1

Wow, thanks.

>
>> ./commit_tests.py 59-60
>> ./tree_conflict_tests.py
>
> and there's also
>
> ./stat_tests.py 31
> ./revert_tests.py 19

Great, thanks a lot! So here's the updated list:

./update_tests.py 46-50
./switch_tests.py 31-35
./merge_tests.py 101-103 111-121
./info_tests.py 1
./commit_tests.py 59-60
./tree_conflict_tests.py
./stat_tests.py 31
./revert_tests.py 19

It's handy to put this into a script and run all tc tests to see what issue
to tackle next.

Looking at the results, the most prominently visible fix needed is that
subnodes are not reported as A/D/M when a conflict is reported on the parent.

D D/D1
C D

D is to be deleted, but that's a conflict. Instead, it should just show

   C D/D1

So what is left to do?

- Change test expectations to conflict on the victim, not on the parent
(update, switch, merge, status, ...).
- Change svn behaviour so that it complies.
- Implement dirs_same_p(), inherently fix entire diff code.
- Show status on missing tree conflict victims.

What more do you have on your mind, what are you guys fixing right now?

and still unanswered:
>> Btw, what's the status of tree_conflict_tests.py?

Thanks
~Neels

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

Received on 2008-10-18 23:23:25 CEST

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