subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "TreeConflictTests" by StefanSperling
Date Mon, 23 Jan 2017 18:58:22 GMT
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 StefanSperling:
https://wiki.apache.org/subversion/TreeConflictTests?action=diff&rev1=15&rev2=16

Comment:
move miscategorized tests 3 and 4 into add dir vs add dir set of tests

  
  ||'''incoming><<BR>>local \/'''||<^>'''edit_f'''||<^>'''add_f'''||<^>'''add_d'''||<^>'''rm_f'''||<^>'''rm_d'''||<^>'''mv_f'''||<^>'''mv_d^f'''||
  ||'''edit_f''' ||            ||           ||           || 10. resolve: ignore<<BR>>11.
resolve: accept<<BR>>24. incoming replace: options ||      || 12. resolve: text
merge<<BR>>24. resolve: merge with text conflict<<BR>>22. chained
move - resolve: text merge<<BR>>27: resolve: text merge (prop conflict)<<BR>>33:
resolve: text merge (with keywords) || 17. incoming move dir: options<<BR>>18.
with local edit<<BR>>19. with local add<<BR>>23. with moved file ||
- ||'''add_f'''  ||            || 1. resolve: ignore<<BR>>2. resolve: text merge<<BR>>3.
resolve: replace<<BR>>4. resolve: replace and merge ||       ||      ||      ||
     ||        ||
+ ||'''add_f'''  ||            || 1. resolve: ignore<<BR>>2. resolve: text merge||
      ||      ||      ||      ||        ||
- ||'''add_d'''  ||            ||           || 5. with file change - resolve: merge<<BR>>6.
with move history - resolve: merge<<BR>>7. resolve: replace<<BR>>
8. resolve: replace and merge<<BR>>9. with file change - resolve: replace    ||
     ||      ||      ||        ||
+ ||'''add_d'''  ||            ||           ||3. resolve: replace<<BR>>4. resolve:
replace and merge<<BR>>5. with file change - resolve: merge<<BR>>6.
with move history - resolve: merge<<BR>>7. resolve: replace<<BR>>
8. resolve: replace and merge<<BR>>9. with file change - resolve: replace    ||
     ||      ||      ||        ||
  ||'''rm_f'''   ||            ||           ||           || 18. resolve: accept  ||      
   ||          ||            ||
  ||'''rm_d'''   ||            ||           ||           ||          ||          ||      
   ||            ||
  ||'''mv_f'''   || 23. options ||           ||           ||          ||          ||     
    ||            ||

Mime
View raw message