You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by Apache subversion Wiki <co...@subversion.apache.org> on 2017/01/23 18:47:36 UTC

[Subversion Wiki] Update of "TreeConflictTests" by StefanSperling

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=13&rev2=14

Comment:
Add new conflict-test --list output; update test numbering in table but don't add any new tests yet

  === merge ===
  
  ||'''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>>20. resolve: merge with text conflict<<BR>>22. chained move - resolve: text merge<<BR>>27: resolve: text merge (prop conflict)<<BR>>28: resolve: text merge (with keywords) || 15. incoming move dir: options<<BR>>16. with local edit<<BR>>17. with local add<<BR>>23. with moved file ||
+ ||'''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_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    ||      ||      ||      ||        ||
  ||'''rm_f'''   ||            ||           ||           || 18. resolve: accept  ||          ||          ||            ||
  ||'''rm_d'''   ||            ||           ||           ||          ||          ||          ||            ||
- ||'''mv_f'''   || 21. options ||           ||           ||          ||          ||          ||            ||
+ ||'''mv_f'''   || 23. options ||           ||           ||          ||          ||          ||            ||
  ||'''mv_d^f''' ||            ||           ||           ||          ||          ||          ||            ||
  
  === update ===
  
  ||'''incoming><<BR>>local \/'''||<^>'''edit_f'''||<^>'''add_f'''||<^>'''add_d'''||<^>'''rm_f'''||<^>'''rm_d'''||<^>'''mv_f'''||<^>'''mv_d^f'''||
- ||'''edit_f''' ||            ||           ||           ||          ||          || 13. resolve: text merge ||           ||
+ ||'''edit_f''' ||            ||           ||           ||          ||          || 15. resolve: text merge ||           ||
- ||'''add_f'''  ||            || 26: resolve: text merge ||           ||          ||          ||          ||            ||
+ ||'''add_f'''  ||            || 31: resolve: text merge ||           ||          ||          ||          ||            ||
  ||'''add_d'''  ||            ||           ||           ||          ||          ||          ||            ||
  ||'''rm_f'''   ||            ||           ||           ||          ||          ||          ||            ||
  ||'''rm_d'''   ||            ||           ||           ||          ||          ||          ||            ||
- ||'''mv_f'''   ||            ||           ||           ||          ||          ||          || 25: resolve: move dir merge ||
+ ||'''mv_f'''   ||            ||           ||           ||          ||          ||          || 32: resolve: move dir merge ||
  ||'''mv_d^f''' ||            ||           ||           ||          ||          ||          ||            ||
  
  === switch ===
  
  ||'''incoming><<BR>>local \/'''||<^>'''edit_f'''||<^>'''add_f'''||<^>'''add_d'''||<^>'''rm_f'''||<^>'''rm_d'''||<^>'''mv_f'''||<^>'''mv_d^f'''||
- ||'''edit_f''' ||            ||           ||           ||          ||          || 14. resolve: text merge ||            ||
+ ||'''edit_f''' ||            ||           ||           ||          ||          || 16. resolve: text merge ||            ||
  ||'''add_f'''  ||            ||           ||           ||          ||          ||          ||            ||
  ||'''add_d'''  ||            ||           ||           ||          ||          ||          ||            ||
  ||'''rm_f'''   ||            ||           ||           ||          ||          ||          ||            ||
@@ -59, +59 @@

     7           merge incoming add dir replace
     8           merge incoming add dir replace and merge
     9           merge incoming add dir replace with file change
-   10           merge incoming delete ignore
+   10           merge incoming delete file ignore
-   11           merge incoming delete accept
+   11           merge incoming delete file accept
    12           merge incoming move file text merge
+   13           update incoming delete file ignore
+   14           update incoming delete file accept
-   13           update incoming move file text merge
+   15           update incoming move file text merge
-   14           switch incoming move file text merge
+   16           switch incoming move file text merge
-   15           merge incoming move dir
+   17           merge incoming move dir
-   16           merge incoming move dir with local edit
+   18           merge incoming move dir with local edit
-   17           merge incoming move dir with local add
+   19           merge incoming move dir with local add
-   18           merge incoming delete vs local delete
+   20           merge incoming delete vs local delete
-   19           merge file property
+   21           merge file property
-   20           merge incoming move file merge with text conflict
+   22           merge incoming move file merge with text conflict
-   21           merge incoming edit for a moved-away working file
+   23           merge incoming edit for a moved-away working file
-   22           merge incoming chained move vs local edit
+   24           merge incoming chained move vs local edit
-   23           merge incoming moved dir with moved file
+   25           merge incoming moved dir with moved file
-   24           merge incoming file move with new line of history
+   26           merge incoming file move with new line of history
-   25           update incoming dir move with nested file move
+   27           update incoming dir move with nested file move
+   28           update incoming dir move with parent move
+   29           update incoming dir move with parent moved back
+   30           update incoming dir move with parent moved twice
-   26           update incoming add file text merge
+   31           update incoming add file text merge
-   27           merge incoming move file merge with prop conflict
+   32           merge incoming move file merge with prop conflict
-   28           merge incoming move file merge with keywords
+   33           merge incoming move file merge with keywords
+   34           update incoming add dir ignore
+   35           update incoming add dir merge
+   36           update incoming add dir merge with obstructions
  }}}