You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/08/14 23:52:03 UTC
svn commit: r1695992 - in /subversion/trunk: ./ build.conf notes/
subversion/libsvn_fs_x/ subversion/tests/libsvn_fs_x/
tools/client-side/svn-mergeinfo-normalizer/
Author: stefan2
Date: Fri Aug 14 21:52:03 2015
New Revision: 1695992
URL: http://svn.apache.org/r1695992
Log:
Merge the svn-mergeinfo-normalizer development branch to trunk and remove
the BRANCH-README file. There were no conflicts.
This brings the client-side tool svn-mergeinfo-normalizer to /trunk.
Added:
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/
- copied from r1695991, subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/
Modified:
subversion/trunk/ (props changed)
subversion/trunk/build.conf
subversion/trunk/notes/ (props changed)
subversion/trunk/subversion/libsvn_fs_x/ (props changed)
subversion/trunk/subversion/tests/libsvn_fs_x/ (props changed)
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 14 21:52:03 2015
@@ -76,6 +76,7 @@
/subversion/branches/svn-auth-x509:1603509-1655900
/subversion/branches/svn-info-detail:1660035-1662618
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer:1642232-1695991
/subversion/branches/svn-patch-improvements:918519-934609
/subversion/branches/svn_mutex:1141683-1182099
/subversion/branches/svnpatch-diff:865738-876477
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1695992&r1=1695991&r2=1695992&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Fri Aug 14 21:52:03 2015
@@ -1532,6 +1532,7 @@ path = build/win32
libs = __ALL_TESTS__
diff diff3 diff4 fsfs-access-map svnauth
svn-populate-node-origins-index x509-parser svn-wc-db-tester
+ svn-mergeinfo-normalizer
[__LIBS__]
type = project
@@ -1646,6 +1647,13 @@ path = tools/dev/svnraisetreeconflict
libs = libsvn_wc libsvn_subr apriconv apr
install = tools
+[svn-mergeinfo-normalizer]
+type = exe
+path = tools/client-side/svn-mergeinfo-normalizer
+install = tools
+libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
+ apriconv apr
+
[x509-parser]
description = Tool to verify x509 certificates
type = exe
Propchange: subversion/trunk/notes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 14 21:52:03 2015
@@ -30,6 +30,7 @@
/subversion/branches/subtree-mergeinfo/notes:876734-878766
/subversion/branches/svn-auth-x509/notes:1603509-1655900
/subversion/branches/svn-mergeinfo-enhancements/notes:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer/notes:1642232-1695991
/subversion/branches/svn-patch-improvements/notes:918519-934609
/subversion/branches/svnpatch-diff/notes:865738-876477
/subversion/branches/svnraisetc/notes:874709-875149
Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 14 21:52:03 2015
@@ -74,6 +74,7 @@
/subversion/branches/subtree-mergeinfo/subversion/libsvn_fs_x:876734-878766
/subversion/branches/svn-auth-x509/subversion/libsvn_fs_x:1603509-1655900
/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_fs_x:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer/subversion/libsvn_fs_x:1642232-1695991
/subversion/branches/svn-patch-improvements/subversion/libsvn_fs_x:918519-934609
/subversion/branches/svn_mutex/subversion/libsvn_fs_x:1141683-1182099
/subversion/branches/svnpatch-diff/subversion/libsvn_fs_x:865738-876477
Propchange: subversion/trunk/subversion/tests/libsvn_fs_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 14 21:52:03 2015
@@ -67,6 +67,7 @@
/subversion/branches/subtree-mergeinfo/subversion/tests/libsvn_fs_x:876734-878766
/subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs_x:1603509-1655900
/subversion/branches/svn-mergeinfo-enhancements/subversion/tests/libsvn_fs_x:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer/subversion/tests/libsvn_fs_x:1642232-1695991
/subversion/branches/svn-patch-improvements/subversion/tests/libsvn_fs_x:918519-934609
/subversion/branches/svn_mutex/subversion/tests/libsvn_fs_x:1141683-1182099
/subversion/branches/svnpatch-diff/subversion/tests/libsvn_fs_x:865738-876477