subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1781867 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Mon, 06 Feb 2017 10:22:59 GMT
Author: stsp
Date: Mon Feb  6 10:22:59 2017
New Revision: 1781867

URL: http://svn.apache.org/viewvc?rev=1781867&view=rev
Log:
Follow-up to r1781855:

* subversion/libsvn_client/conflicts.c
  (describe_incoming_deletion_upon_update): Remove now unused code.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1781867&r1=1781866&r2=1781867&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Feb  6 10:22:59 2017
@@ -2739,13 +2739,8 @@ describe_incoming_deletion_upon_update(
           if (details->moves)
             {
               struct repos_move_info *move;
-              const char *moved_to_repos_relpath;
 
               move = APR_ARRAY_IDX(details->moves, 0, struct repos_move_info *);
-              if (details->move_target_repos_relpath)
-                moved_to_repos_relpath = details->move_target_repos_relpath;
-              else
-                moved_to_repos_relpath = move->moved_to_repos_relpath;
               description =
                 apr_psprintf(result_pool,
                              _("%s\nThe replaced file was moved to '^/%s'."),



Mime
View raw message