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 2013/03/28 05:01:01 UTC
svn commit: r1461947 - in /subversion/branches/1.7.x: ./ STATUS
subversion/svnserve/serve.c
Author: svn-role
Date: Thu Mar 28 04:01:00 2013
New Revision: 1461947
URL: http://svn.apache.org/r1461947
Log:
Merge r1461278 from trunk:
* r1461278
Make svnserve log the replayed revision, not the low-water-mark
revision, when logging the 'replay' operation.
Justification:
User-reported bug confusing administrators.
Votes:
+1: cmpilato, rhuijben, stefan2
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svnserve/serve.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1461278
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461947&r1=1461946&r2=1461947&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Mar 28 04:01:00 2013
@@ -279,11 +279,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1461278
- Make svnserve log the replayed revision, not the low-water-mark
- revision, when logging the 'replay' operation.
- Justification:
- User-reported bug confusing administrators.
- Votes:
- +1: cmpilato, rhuijben, stefan2
Modified: subversion/branches/1.7.x/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svnserve/serve.c?rev=1461947&r1=1461946&r2=1461947&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svnserve/serve.c (original)
+++ subversion/branches/1.7.x/subversion/svnserve/serve.c Thu Mar 28 04:01:00 2013
@@ -2766,8 +2766,7 @@ static svn_error_t *replay_one_revision(
svn_error_t *err;
SVN_ERR(log_command(b, conn, pool,
- svn_log__replay(b->fs_path->data, low_water_mark,
- pool)));
+ svn_log__replay(b->fs_path->data, rev, pool)));
svn_ra_svn_get_editor(&editor, &edit_baton, conn, pool, NULL, NULL);