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?action=diff&rev1=1&rev2=2 Comment: Add short summary of tests in the table cells 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. + 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. @@ -14, +14 @@ === merge === - ||'''loc\inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| + ||'''local \ incom'''||'''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 || || || || || + ||'''edit_f''' || || || || 15. resolve: ignore<<BR>>16. resolve: accept<<BR>>29. incoming replace: options || || 17. resolve: text merge<<BR>>25. resolve: merge with text conflict (X)<<BR>>27. chained move - resolve: text merge || 20. incoming move dir: options (X)<<BR>>21. with local edit<<BR>>22. with local add<<BR>>28. with moved file (X) || + ||'''add_f''' || || 1. resolve: ignore<<BR>>2. resolve: text merge<<BR>>3. resolve: replace<<BR>>4. resolve: replace and merge || || || || || || + ||'''add_d''' || || || 8. resolve: ignore<<BR>>9. resolve: merge<<BR>>10. with file change - resolve: merge<<BR>>11. with move history - resolve: merge<<BR>>12. resolve: replace<<BR>>13. resolve: replace and merge (X)<<BR>>14. with file change - resolve: replace || || || || || - ||'''rm_f''' || || || || 23 || || || || + ||'''rm_f''' || || || || 23. resolve: accept || || || || ||'''rm_d''' || || || || || || || || - ||'''mv_f''' || 26 X || || || || || || || + ||'''mv_f''' || 26. options (X) || || || || || || || ||'''mv_d^f''' || || || || || || || || === update === - ||'''loc\inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| + ||'''local \ incom'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| - ||'''edit_f''' || || || || || || 18 || || + ||'''edit_f''' || || || || || || 18. resolve: text merge || || - ||'''add_f''' || || 5<<BR>>6 || || || || || || + ||'''add_f''' || || 5. resolve: ignore<<BR>>6. resolve: replace || || || || || || ||'''add_d''' || || || || || || || || ||'''rm_f''' || || || || || || || || ||'''rm_d''' || || || || || || || || @@ -36, +36 @@ === switch === - ||'''loc\inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| + ||'''local \ incom'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| - ||'''edit_f''' || || || || || || 19 || || + ||'''edit_f''' || || || || || || 19. resolve: text merge || || - ||'''add_f''' || || 7 || || || || || || + ||'''add_f''' || || 7. resolve: ignore || || || || || || ||'''add_d''' || || || || || || || || ||'''rm_f''' || || || || || || || || ||'''rm_d''' || || || || || || || ||
