Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for 
change notification.

The "TreeConflictTests" page has been changed by JohanCorveleyn:
https://wiki.apache.org/subversion/TreeConflictTests

Comment:
Initial draft, matrices filled with test numbers from current conflicts-test.c

New page:
= Tree Conflict Tests =

Below you can find, per "operation", a matrix of tree conflict tests, so we 
have an idea of how much work is still left to increase test coverage. The 
matrix row headers give the "local" situation, the column headers the "incoming 
change". These are only meant to be broad categories, an actual test may build 
up a very complex situation (but still be part of a certain category). The 
categories might need to be extended.

The numbers refer to the test numbers. An X indicates an XFail test.

TODO:
 * Add some short test summary with each test number (directly in the cell, or 
linked to a footnote?). While we're at it, make it possible to add additional 
comments.
 * Extend the matrices with extra categories. For instance, for "merge" I'm 
thinking of using "add_f,edit_f" to indicate "f was added on the branch 
(anything before the comma) and locally edited (anything behind the comma)". In 
that case ",add_f" would be "branch is in sync, but has added f as a local 
uncommitted change"
 * Create "cherrypick" as a specific "operation" with its own matrix? Here we 
could also create additional categories for incoming, to discern between what 
happened on trunk before the cherrypick-rev, and what's part of the 
cherrypick-rev ("mv_f,edit_f" then means: file was moved on trunk, and edited, 
and only the edit is cherrypick-merged).
 * Create a script that can parse our C (and python?) tests, or their --list 
output. To help the script we could add some sort of tagging to our tests (in 
the test description), so it knows to what part of what matrix the test 
belongs. For instance: "[add_f-add_f] incoming add file ignore".

=== merge ===

||'''loc\inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''||
||'''edit_f''' ||            ||           ||           || 15<<BR>>16<<BR>>29 || 
     || 17<<BR>>25 X<<BR>>27 || 20 X<<BR>>21<<BR>>22<<BR>>28 X ||
||'''add_f'''  ||            || 1<<BR>>2<<BR>>3<<BR>>4 ||       ||      ||      
||      ||        ||
||'''add_d'''  ||            ||           || 
8<<BR>>9<<BR>>10<<BR>>11<<BR>>12<<BR>>13 X<<BR>>14    ||      ||      ||      
||        ||
||'''rm_f'''   ||            ||           ||           || 23       ||          
||          ||            ||
||'''rm_d'''   ||            ||           ||           ||          ||          
||          ||            ||
||'''mv_f'''   || 26 X       ||           ||           ||          ||          
||          ||            ||
||'''mv_d^f''' ||            ||           ||           ||          ||          
||          ||            ||

=== update ===

||'''loc\inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''||
||'''edit_f''' ||            ||           ||           ||          ||          
|| 18       ||            ||
||'''add_f'''  ||            || 5<<BR>>6  ||           ||          ||          
||          ||            ||
||'''add_d'''  ||            ||           ||           ||          ||          
||          ||            ||
||'''rm_f'''   ||            ||           ||           ||          ||          
||          ||            ||
||'''rm_d'''   ||            ||           ||           ||          ||          
||          ||            ||
||'''mv_f'''   ||            ||           ||           ||          ||          
||          ||            ||
||'''mv_d^f''' ||            ||           ||           ||          ||          
||          ||            ||

=== switch ===

||'''loc\inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''||
||'''edit_f''' ||            ||           ||           ||          ||          
|| 19       ||            ||
||'''add_f'''  ||            || 7         ||           ||          ||          
||          ||            ||
||'''add_d'''  ||            ||           ||           ||          ||          
||          ||            ||
||'''rm_f'''   ||            ||           ||           ||          ||          
||          ||            ||
||'''rm_d'''   ||            ||           ||           ||          ||          
||          ||            ||
||'''mv_f'''   ||            ||           ||           ||          ||          
||          ||            ||
||'''mv_d^f''' ||            ||           ||           ||          ||          
||          ||            ||

Reply via email to