You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/11/04 04:01:11 UTC
svn commit: r1845711 - in /subversion/branches/1.11.x: ./ STATUS
subversion/libsvn_client/conflicts.c subversion/svn/conflict-callbacks.c
Author: svn-role
Date: Sun Nov 4 04:01:11 2018
New Revision: 1845711
URL: http://svn.apache.org/viewvc?rev=1845711&view=rev
Log:
Merge the r1845556 group from trunk:
* r1845556, r1845559
Fix (false positive) gcc 8.x -Wmisleading-indentation warnings.
Justification:
Cleaner build logs.
Votes:
+1: jorton, brane, rhuijben
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c
subversion/branches/1.11.x/subversion/svn/conflict-callbacks.c
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 4 04:01:11 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204,1845261,1845408,1845555
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204,1845261,1845408,1845555-1845556,1845559
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845711&r1=1845710&r2=1845711&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Nov 4 04:01:11 2018
@@ -42,10 +42,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1845556, r1845559
- Fix (false positive) gcc 8.x -Wmisleading-indentation warnings.
- Justification:
- Cleaner build logs.
- Votes:
- +1: jorton, brane, rhuijben
Modified: subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c?rev=1845711&r1=1845710&r2=1845711&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c (original)
+++ subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c Sun Nov 4 04:01:11 2018
@@ -10861,8 +10861,8 @@ svn_client_conflict_option_get_moved_to_
svn_dirent_local_style(victim_abspath,
scratch_pool));
- *possible_moved_to_abspaths = apr_array_make(result_pool, 1,
- sizeof (const char *));
+ *possible_moved_to_abspaths = apr_array_make(result_pool, 1,
+ sizeof (const char *));
if (details->wc_move_targets)
{
apr_array_header_t *move_target_wc_abspaths;
Modified: subversion/branches/1.11.x/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/svn/conflict-callbacks.c?rev=1845711&r1=1845710&r2=1845711&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/1.11.x/subversion/svn/conflict-callbacks.c Sun Nov 4 04:01:11 2018
@@ -1534,16 +1534,16 @@ build_tree_conflict_options(
id != svn_client_conflict_option_accept_current_wc_state)
*all_options_are_dumb = FALSE;
- if (*possible_moved_to_repos_relpaths == NULL)
- SVN_ERR(
- svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(
- possible_moved_to_repos_relpaths, builtin_option,
- result_pool, iterpool));
+ if (*possible_moved_to_repos_relpaths == NULL)
+ SVN_ERR(
+ svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(
+ possible_moved_to_repos_relpaths, builtin_option,
+ result_pool, iterpool));
- if (*possible_moved_to_abspaths == NULL)
- SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2(
- possible_moved_to_abspaths, builtin_option,
- result_pool, iterpool));
+ if (*possible_moved_to_abspaths == NULL)
+ SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2(
+ possible_moved_to_abspaths, builtin_option,
+ result_pool, iterpool));
}
svn_pool_destroy(iterpool);