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=3&rev2=4 Comment: Make the "incoming / local" indication in the top-left of the tables more clear === merge === - ||'''loc \ inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| + ||'''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. {X} resolve: merge with text conflict<<BR>>22. chained move - resolve: text merge || 15. {X} incoming move dir: options<<BR>>16. with local edit<<BR>>17. with local add<<BR>>23. {X} 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. {X} resolve: replace and merge<<BR>>9. with file change - resolve: replace || || || || || @@ -25, +25 @@ === update === - ||'''loc \ inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| + ||'''incoming><<BR>>local \/'''||<^>'''edit_f'''||<^>'''add_f'''||<^>'''add_d'''||<^>'''rm_f'''||<^>'''rm_d'''||<^>'''mv_f'''||<^>'''mv_d^f'''|| ||'''edit_f''' || || || || || || 13. resolve: text merge || || ||'''add_f''' || || || || || || || || ||'''add_d''' || || || || || || || || @@ -36, +36 @@ === switch === - ||'''loc \ inc'''||'''edit_f'''||'''add_f'''||'''add_d'''||'''rm_f'''||'''rm_d'''||'''mv_f'''||'''mv_d^f'''|| + ||'''incoming><<BR>>local \/'''||<^>'''edit_f'''||<^>'''add_f'''||<^>'''add_d'''||<^>'''rm_f'''||<^>'''rm_d'''||<^>'''mv_f'''||<^>'''mv_d^f'''|| ||'''edit_f''' || || || || || || 14. resolve: text merge || || ||'''add_f''' || || || || || || || || ||'''add_d''' || || || || || || || ||
