svn commit: r1732163 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Wed Feb 24 14:39:01 2016
New Revision: 1732163

URL: http://svn.apache.org/viewvc?rev=1732163&view=rev
Log:
Make the interactive resolver always show detailed conflict descriptions.

Forcing the user to pick an option before necessary information becomes
visible is not very nice. The only downside is that 'svn resolve' will
always contact the repository when resolving particular tree conflicts.

* subversion/svn/conflict-callbacks.c
  (extra_resolver_options_tree): Remove "g" option.
  (handle_tree_conflict): Drop the "g" option. Always get conflict details.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1732163&r1=1732162&r2=1732163&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Feb 24 14:39:01 2016
@@ -476,8 +476,6 @@ static const resolver_option_t extra_res
 {
   /* Translators: keep long_desc below 70 characters (wrap with a left
      margin of 9 spaces if needed) */
-  { "g",  N_("get more details"), N_("get more information from repository"),
-                                   svn_client_conflict_option_undefined },
   { "h",  N_("help"),             N_("show this help (also '?')"),
                                    svn_client_conflict_option_undefined },
   { NULL }
@@ -1434,6 +1432,9 @@ handle_tree_conflict(svn_boolean_t *reso
 
   option_id = svn_client_conflict_option_unspecified;
 
+  /* Always show the best possible conflict description and options. */
+  SVN_ERR(svn_client_conflict_tree_get_details(conflict, scratch_pool));
+
   SVN_ERR(svn_client_conflict_tree_get_description(
            &description, conflict, scratch_pool, scratch_pool));
   SVN_ERR(svn_cmdline_fprintf(
@@ -1490,22 +1491,6 @@ handle_tree_conflict(svn_boolean_t *reso
           *quit = TRUE;
           break;
         }
-      else if (strcmp(opt->code, "g") == 0)
-        {
-          /* User wants to get more information from the repository. */
-          SVN_ERR(svn_client_conflict_tree_get_details(conflict, iterpool));
-
-          /* Description might have changed. Show it again. */
-          SVN_ERR(svn_client_conflict_tree_get_description(
-                   &description, conflict, scratch_pool, iterpool));
-          SVN_ERR(svn_cmdline_fprintf(stderr, iterpool, _("   > %s\n"),
-                                      description));
-
-          /* Options might have changed. Rebuild the list. */
-          SVN_ERR(build_tree_conflict_options(&tree_conflict_options, conflict,
-                                              scratch_pool, iterpool));
-          continue;
-        }
       else if (opt->choice != svn_client_conflict_option_undefined)
         {
           option_id = opt->choice;