svn commit: r1205798 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

[stsp]

Author: stsp
Date: Thu Nov 24 12:08:22 2011
New Revision: 1205798

URL: http://svn.apache.org/viewvc?rev=1205798&view=rev
Log:
On the moves-scan-log branch, eliminate a small bit of code duplication.

* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): If the user chose to scan for moves and
   they have already been scanned, jump to code at the start of the loop
   to present scanned moves instead of duplicating the same bit of code
   at a different spot.

Modified:
    subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

Modified: subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c?rev=1205798&r1=1205797&r2=1205798&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c 
(original)
+++ subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c Thu 
Nov 24 12:08:22 2011
@@ -918,30 +918,10 @@ svn_cl__conflict_handler(svn_wc_conflict
           if (strcmp(answer, "s") == 0)
             {
               if (desc->suggested_moves)
-                {
-                  svn_wc_repos_move_info_t *move;
+                continue;
 
-                  if (desc->suggested_moves->nelts == 0)
-                    {
-                      SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
-                              _("No moves found in revision log.\n")));
-                      continue;
-                    }
-
-                  SVN_ERR(pick_move(&move, desc->suggested_moves, b->pb,
-                                    subpool));
-                  if (move)
-                    {
-                      (*result)->choice = svn_wc_conflict_choose_incoming_move;
-                      (*result)->incoming_move = move;
-                      break;
-                    }
-                }
-              else
-                {
-                  (*result)->choice = 
svn_wc_conflict_choose_scan_log_for_moves;
-                  break;
-                }
+              (*result)->choice = svn_wc_conflict_choose_scan_log_for_moves;
+              break;
             }
         }
     }