{"push_id":873484849,"size":1,"distinct_size":1,"ref":"refs/heads/trunk","head":"9a0611d1cfe75dc8b9f1e9374716593b5407c03c","before":"ca85283be465e5814b550bb5c7648f78b87acbb9","commits":[{"sha":"9a0611d1cfe75dc8b9f1e9374716593b5407c03c","author":{"email":"4cc39c5df77ceab08d1922952264452f5ce6cf3c@apache.org","name":"Julian Foad"},"message":"Improve 'svnmover' conflict displays a little bit.\n\nReport the relevant inputs (yca, src, tgt) for each element in conflict and\nidentify elements by their paths (as far as possible) when the UI mode is\n'paths'.\n\nDetect cycles better: only report the elements involved in a cycle, not all\nelements whose parentage leads to a cycle.\n\n* tools/dev/svnmover/merge3.c\n  (partial_relpath,\n   display_relpath,\n   merged_element_id_str): New.\n  (element_merge3_conflict_str,\n   name_clash_conflict_str,\n   cycle_conflict_str,\n   orphan_conflict_str,\n   svnmover_display_conflicts): Display nicer descriptions.\n  (record_cycle): New.\n  (detect_cycles): Improve.\n  (branch_merge_subtree_r): Store references to the branch states.\n\n* tools/dev/svnmover/svnmover.c\n  (the_ui_mode): Move this and its enumeration constants...\n\n* tools/dev/svnmover/svnmover.h\n  (the_ui_mode): ... to here.\n  (conflict_storage_t): Store references to the four (yca, src, tgt, merge)\n    branch states here.\n\n\ngit-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1715354 13f79535-47bb-0310-9956-ffa450edef68","distinct":true,"url":"https://api.github.com/repos/apache/subversion/commits/9a0611d1cfe75dc8b9f1e9374716593b5407c03c"}]}