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 19:02:53 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=16&rev2=17

Comment:
add tests 34,35,36

  ||'''incoming><<BR>>local \/'''||<^>'''edit_f'''||<^>'''add_f'''||<^>'''add_d'''||<^>'''rm_f'''||<^>'''rm_d'''||<^>'''mv_f'''||<^>'''mv_d^f'''||
  ||'''edit_f''' ||            ||           ||           || 13. resolve: ignore<<BR>>14.
resolve: accept         ||          || 15. resolve: text merge ||           ||
  ||'''add_f'''  ||            || 31: resolve: text merge ||           ||          ||    
     ||          ||            ||
- ||'''add_d'''  ||            ||           ||           ||          ||          ||      
   ||            ||
+ ||'''add_d'''  ||            ||           || 34. resolve: ignore<<BR>>35. resolve:
merge<<BR>>36. with obstructions -- resolve: merge||          ||          || 
        ||            ||
  ||'''rm_f'''   ||            ||           ||           ||          ||          ||      
   ||            ||
  ||'''rm_d'''   ||            ||           ||           ||          ||          ||      
   ||            ||
  ||'''mv_f'''   ||            ||           ||           ||          ||          ||      
   || 32: resolve: move dir merge ||

Mime
View raw message