You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2016/10/11 15:59:10 UTC
svn commit: r1764277 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: kotkov
Date: Tue Oct 11 15:59:10 2016
New Revision: 1764277
URL: http://svn.apache.org/viewvc?rev=1764277&view=rev
Log:
Following up on r1764273, fix indentation in the check_move_ancestry()
function.
* subversion/libsvn_client/conflicts.c
(check_move_ancestry): As above.
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=1764277&r1=1764276&r2=1764277&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Oct 11 15:59:10 2016
@@ -331,19 +331,19 @@ check_move_ancestry(svn_boolean_t *relat
}
if (check_last_changed_rev)
- {
- svn_dirent_t *dirent;
+ {
+ svn_dirent_t *dirent;
- /* Verify that copyfrom_rev >= last-changed revision of the
- * deleted node. */
- SVN_ERR(svn_ra_stat(ra_session, "", deleted_rev - 1, &dirent,
- scratch_pool));
- if (dirent == NULL || copyfrom_rev < dirent->created_rev)
- {
- *related = FALSE;
- return SVN_NO_ERROR;
- }
- }
+ /* Verify that copyfrom_rev >= last-changed revision of the
+ * deleted node. */
+ SVN_ERR(svn_ra_stat(ra_session, "", deleted_rev - 1, &dirent,
+ scratch_pool));
+ if (dirent == NULL || copyfrom_rev < dirent->created_rev)
+ {
+ *related = FALSE;
+ return SVN_NO_ERROR;
+ }
+ }
*related = TRUE;
return SVN_NO_ERROR;