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 2020/07/12 04:00:12 UTC
svn commit: r1879797 - in /subversion/branches/1.14.x: ./ .editorconfig
STATUS
Author: svn-role
Date: Sun Jul 12 04:00:12 2020
New Revision: 1879797
URL: http://svn.apache.org/viewvc?rev=1879797&view=rev
Log:
Merge r1876410 from trunk:
* r1876410
Fix the .editorconfig stanza for Makefile's.
Justification:
Make $EDITOR do the right thing on any backport branches we may create
off this stabilization branch.
Votes:
+1: danielsh, stsp, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/.editorconfig
subversion/branches/1.14.x/STATUS
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1876410
Modified: subversion/branches/1.14.x/.editorconfig
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/.editorconfig?rev=1879797&r1=1879796&r2=1879797&view=diff
==============================================================================
--- subversion/branches/1.14.x/.editorconfig (original)
+++ subversion/branches/1.14.x/.editorconfig Sun Jul 12 04:00:12 2020
@@ -10,6 +10,7 @@ trim_trailing_whitespace = false
[**/Makefile*]
indent_style = tab
+indent_size = 8
[build-outputs.mk]
indent_style = tab
Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1879797&r1=1879796&r2=1879797&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Jul 12 04:00:12 2020
@@ -29,14 +29,6 @@ Approved changes:
Votes:
+1: futatuki, stsp, rhuijben
- * r1876410
- Fix the .editorconfig stanza for Makefile's.
- Justification:
- Make $EDITOR do the right thing on any backport branches we may create
- off this stabilization branch.
- Votes:
- +1: danielsh, stsp, jamessan
-
* r1878413
autogen.sh: Remove per SWIG bindings checked files on release mode.
Justification:
@@ -62,4 +54,3 @@ Approved changes:
handle. So make sure you recompile the sql queries for testing.
Votes:
+1: rhuijben, danielsh, jamessan
-