You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/12/01 11:50:07 UTC
svn commit: r1642663 -
/subversion/branches/1.7.x-r1227815-conflict/subversion/libsvn_repos/dump.c
Author: rhuijben
Date: Mon Dec 1 10:50:06 2014
New Revision: 1642663
URL: http://svn.apache.org/r1642663
Log:
Fix compile error on 1.7.x caused by the 1.7.x-r1574868 backport.
* subversion/libsvn_repos/dump.c
(dump_node): Use baton value as boolean as dump_node as r1227815 didn't
change the baton on this branch to the 1.8.x+ style.
Modified:
subversion/branches/1.7.x-r1227815-conflict/subversion/libsvn_repos/dump.c
Modified: subversion/branches/1.7.x-r1227815-conflict/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1227815-conflict/subversion/libsvn_repos/dump.c?rev=1642663&r1=1642662&r2=1642663&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1227815-conflict/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/1.7.x-r1227815-conflict/subversion/libsvn_repos/dump.c Mon Dec 1 10:50:06 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));