From owner-svn-src-head@FreeBSD.ORG Tue Jun 18 16:36:23 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2890F344; Tue, 18 Jun 2013 16:36:23 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0AF9F16C5; Tue, 18 Jun 2013 16:36:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IGaMSJ026664; Tue, 18 Jun 2013 16:36:22 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5IGaLt2026657; Tue, 18 Jun 2013 16:36:21 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201306181636.r5IGaLt2026657@svn.freebsd.org> From: Peter Wemm Date: Tue, 18 Jun 2013 16:36:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251956 - in head/contrib/subversion/subversion: include libsvn_fs_fs libsvn_subr libsvn_wc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 16:36:23 -0000 Author: peter Date: Tue Jun 18 16:36:21 2013 New Revision: 251956 URL: http://svnweb.freebsd.org/changeset/base/251956 Log: Merge 1.8.0 Modified: head/contrib/subversion/subversion/include/svn_version.h head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h head/contrib/subversion/subversion/libsvn_subr/internal_statements.h head/contrib/subversion/subversion/libsvn_wc/wc-checks.h head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h head/contrib/subversion/subversion/libsvn_wc/wc-queries.h Directory Properties: head/contrib/subversion/ (props changed) Modified: head/contrib/subversion/subversion/include/svn_version.h ============================================================================== --- head/contrib/subversion/subversion/include/svn_version.h Tue Jun 18 16:34:22 2013 (r251955) +++ head/contrib/subversion/subversion/include/svn_version.h Tue Jun 18 16:36:21 2013 (r251956) @@ -95,7 +95,7 @@ extern "C" { * * Always change this at the same time as SVN_VER_NUMTAG. */ -#define SVN_VER_TAG " (Release Candidate 3)" +#define SVN_VER_TAG " (r1490375)" /** Number tag: a string describing the version. @@ -110,7 +110,7 @@ extern "C" { * * Always change this at the same time as SVN_VER_TAG. */ -#define SVN_VER_NUMTAG "-rc3" +#define SVN_VER_NUMTAG "" /** Revision number: The repository revision number of this release. Modified: head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h ============================================================================== --- head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h Tue Jun 18 16:34:22 2013 (r251955) +++ head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h Tue Jun 18 16:36:21 2013 (r251956) @@ -1,4 +1,4 @@ -/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.0-rc3/subversion/libsvn_fs_fs/token-map.h. +/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.0/subversion/libsvn_fs_fs/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_CREATE_SCHEMA 0 Modified: head/contrib/subversion/subversion/libsvn_subr/internal_statements.h ============================================================================== --- head/contrib/subversion/subversion/libsvn_subr/internal_statements.h Tue Jun 18 16:34:22 2013 (r251955) +++ head/contrib/subversion/subversion/libsvn_subr/internal_statements.h Tue Jun 18 16:36:21 2013 (r251956) @@ -1,4 +1,4 @@ -/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.0-rc3/subversion/libsvn_subr/token-map.h. +/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.0/subversion/libsvn_subr/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_INTERNAL_SAVEPOINT_SVN 0 Modified: head/contrib/subversion/subversion/libsvn_wc/wc-checks.h ============================================================================== --- head/contrib/subversion/subversion/libsvn_wc/wc-checks.h Tue Jun 18 16:34:22 2013 (r251955) +++ head/contrib/subversion/subversion/libsvn_wc/wc-checks.h Tue Jun 18 16:36:21 2013 (r251956) @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.0-rc3/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.0/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_VERIFICATION_TRIGGERS 0 Modified: head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h ============================================================================== --- head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h Tue Jun 18 16:34:22 2013 (r251955) +++ head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h Tue Jun 18 16:36:21 2013 (r251956) @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.0-rc3/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.0/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_CREATE_SCHEMA 0 Modified: head/contrib/subversion/subversion/libsvn_wc/wc-queries.h ============================================================================== --- head/contrib/subversion/subversion/libsvn_wc/wc-queries.h Tue Jun 18 16:34:22 2013 (r251955) +++ head/contrib/subversion/subversion/libsvn_wc/wc-queries.h Tue Jun 18 16:36:21 2013 (r251956) @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.0-rc3/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.0/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_SELECT_NODE_INFO 0