Checkout
stsp
committed
on 21 Aug 17
Add a new --accept recommended option to 'svn'.

--accept recommended works like --accept postpone, except that tree
conflicts for which a r… Show more
Add a new --accept recommended option to 'svn'.

--accept recommended works like --accept postpone, except that tree

conflicts for which a recommended resolution option exists are

automatically resolved.

* subversion/svn/cl.h

 (SVN_CL__ACCEPT_RECOMMENDED): Declare (as string: "recommended").

* subversion/svn/conflict-callbacks.c

 (svn_cl__accept_from_word): Handle SVN_CL__ACCEPT_RECOMMENDED and provide

  the shorthand form 'r'.

* subversion/svn/svn.c

 (svn_cl__options): Update --accept option help text.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:

  Update expected help output.

Show less