You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2017/08/31 17:00:51 UTC
svn commit: r1806822 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Thu Aug 31 17:00:51 2017
New Revision: 1806822
URL: http://svn.apache.org/viewvc?rev=1806822&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(find_operative_moves): Only duplicate a move struct if the paths in the
new struct will actually differ.
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=1806822&r1=1806821&r2=1806822&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Aug 31 17:00:51 2017
@@ -1788,13 +1788,9 @@ find_operative_moves(apr_array_header_t
move = APR_ARRAY_IDX(moves_in_deleted_rev, i, struct repos_move_info *);
relpath = svn_relpath_skip_ancestor(move->moved_from_repos_relpath,
deleted_repos_relpath);
- if (relpath)
- {
- struct repos_move_info *new_move;
-
- new_move = new_path_adjusted_move(move, relpath, result_pool);
- APR_ARRAY_PUSH(*moves, struct repos_move_info *) = new_move;
- }
+ if (relpath && relpath[0] != '\0')
+ move = new_path_adjusted_move(move, relpath, result_pool);
+ APR_ARRAY_PUSH(*moves, struct repos_move_info *) = move;
}
/* If we didn't find any applicable moves, return NULL. */