You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/14 22:04:06 UTC
svn commit: r1146875 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_repos/dump.c
Author: hwright
Date: Thu Jul 14 20:04:06 2011
New Revision: 1146875
URL: http://svn.apache.org/viewvc?rev=1146875&view=rev
Log:
Merge r1146219 from trunk:
* r1146219
Fix the generated notification.
Justification:
Allow API users to more easily distinguish dump from verify.
Votes:
+1: danielsh
+1: rhuijben, gstein (I think this should just go in 1.7.0)
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 Thu Jul 14 20:04:06 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013
+/subversion/trunk:1146013,1146219
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1146875&r1=1146874&r2=1146875&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Jul 14 20:04:06 2011
@@ -52,14 +52,6 @@ Candidate changes:
Approved changes:
=================
- * r1146219
- Fix the generated notification.
- Justification:
- Allow API users to more easily distinguish dump from verify.
- Votes:
- +1: danielsh
- +1: rhuijben, gstein (I think this should just go in 1.7.0)
-
* r1146222
Add a NULL check in an error path.
Justification
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=1146875&r1=1146874&r2=1146875&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_repos/dump.c Thu Jul 14 20:04:06 2011
@@ -1329,7 +1329,7 @@ svn_repos_verify_fs2(svn_repos_t *repos,
/* We're done. */
if (notify_func)
{
- notify = svn_repos_notify_create(svn_repos_notify_dump_end, iterpool);
+ notify = svn_repos_notify_create(svn_repos_notify_verify_end, iterpool);
notify_func(notify_baton, notify, iterpool);
}