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 2014/12/01 05:00:34 UTC
svn commit: r1642628 - in /subversion/branches/1.7.x: ./ STATUS build.conf
Author: svn-role
Date: Mon Dec 1 04:00:34 2014
New Revision: 1642628
URL: http://svn.apache.org/r1642628
Log:
Merge the r1542610 group from trunk:
* r1542610, r1564576, r1568180
Add missing description to build.conf, to properly generate a version
resource (including icon) for this executable on Windows.
Votes:
+1: rhuijben, breser, stefan2
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build.conf
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1542610,1564576,1568180
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1642628&r1=1642627&r2=1642628&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Dec 1 04:00:34 2014
@@ -120,12 +120,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1542610, r1564576, r1568180
- Add missing description to build.conf, to properly generate a version
- resource (including icon) for this executable on Windows.
- Votes:
- +1: rhuijben, breser, stefan2
-
* r1574868
Don't let invalid mergeinfo stop 'svnadmin dump' from producing a dump.
Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
@@ -154,4 +148,3 @@ Approved changes:
^/subversion/branches/1.7.x-r1641564
Votes:
+1: philip, rhuijben, stefan2
-
Modified: subversion/branches/1.7.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build.conf?rev=1642628&r1=1642627&r2=1642628&view=diff
==============================================================================
--- subversion/branches/1.7.x/build.conf (original)
+++ subversion/branches/1.7.x/build.conf Mon Dec 1 04:00:34 2014
@@ -1224,6 +1224,7 @@ install = tools
libs = libsvn_repos libsvn_subr apr
[svn-populate-node-origins-index]
+description = Tool to populate the node origins index of a repository
type = exe
path = tools/server-side
sources = svn-populate-node-origins-index.c