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/15 18:12:01 UTC
svn commit: r1643027 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_repos/dump.c
Author: svn-role
Date: Wed Dec 3 01:02:34 2014
New Revision: 1643027
URL: http://svn.apache.org/r1643027
Log:
Merge the 1.7.x-r1227815-conflict branch:
* ^/subversion/branches/1.7.x-r1227815-conflict
Fix compilation after backporting 1.7.x-r1574868 branch.
Justification:
1.7.x shouldn't cause compile errors.
Branch:
^/subversion/branches/1.7.x-r1227815-conflict
Votes:
+1: rhuijben, julianfoad, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_repos/dump.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 3 01:02:34 2014
@@ -47,6 +47,7 @@
/subversion/branches/1.7.x-r1201824:1202121-1207333
/subversion/branches/1.7.x-r1210147:1213310-1293110
/subversion/branches/1.7.x-r1213331:1213684-1213756
+/subversion/branches/1.7.x-r1227815-conflict:1642662-1643026
/subversion/branches/1.7.x-r1232221:1232358-1238008
/subversion/branches/1.7.x-r1236343:1236628-1239394
/subversion/branches/1.7.x-r1242759:1372522-1393041
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1643027&r1=1643026&r2=1643027&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Dec 3 01:02:34 2014
@@ -96,15 +96,6 @@ Veto-blocked changes:
Approved changes:
=================
- * ^/subversion/branches/1.7.x-r1227815-conflict
- Fix compilation after backporting 1.7.x-r1574868 branch.
- Justification:
- 1.7.x shouldn't cause compile errors.
- Branch:
- ^/subversion/branches/1.7.x-r1227815-conflict
- Votes:
- +1: rhuijben, julianfoad, philip
-
* r1594156
Fix a problem with the Unix build that could result in linking to the wrong
Subversion libraries at build time or at run time.
Modified: subversion/branches/1.7.x/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_repos/dump.c?rev=1643027&r1=1643026&r2=1643027&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_repos/dump.c Wed Dec 3 01:02:34 2014
@@ -518,7 +518,7 @@ dump_node(struct edit_baton *eb,
/* An error in verifying the mergeinfo must not prevent dumping
the data. Ignore any such error. */
svn_error_clear(verify_mergeinfo_revisions(
- eb->found_old_mergeinfo,
+ &eb->found_old_mergeinfo,
mergeinfo_str->data, eb->oldest_dumped_rev,
eb->notify_func, eb->notify_baton,
pool));