Checkout
rhuijben
committed
on 12 Feb 15
In preparation for my following patch that improves obstruction detection
on update-move extend the 'svn info' output with some information … Show more
In preparation for my following patch that improves obstruction detection

on update-move extend the 'svn info' output with some information about

text and property conflicts that is currently only shown when there is

(also) a tree conflict.

* subversion/svn/cl-conflicts.c

 (svn_cl__get_human_readable_action_description): New function.

* subversion/svn/cl-conflicts.h

 (svn_cl__get_human_readable_action_description): New function.

* subversion/svn/info-cmd.c

 (print_info): Make sure the left and right version are logically

   grouped by adding an header if there is a conflict but no tree

   conflict.

* subversion/tests/cmdline/prop_tests.py

 (dir_prop_conflict_details): Update expected result.

Show less