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 2015/03/19 19:24:11 UTC
svn commit: r1667840 - in /subversion/branches/1.9.x: ./ STATUS
subversion/svnrdump/load_editor.c
Author: svn-role
Date: Thu Mar 19 18:24:11 2015
New Revision: 1667840
URL: http://svn.apache.org/r1667840
Log:
Merge r1664684 from trunk:
* r1664684
svnrdump: don't provide HEAD+1 as base revision when loading deletes.
Justification:
Our own tools should be well behaved.
Votes:
+1: rhuijben, brane, stefan2
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/svnrdump/load_editor.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 18:24:11 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1667840&r1=1667839&r2=1667840&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 19 18:24:11 2015
@@ -178,13 +178,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1664684
- svnrdump: don't provide HEAD+1 as base revision when loading deletes.
- Justification:
- Our own tools should be well behaved.
- Votes:
- +1: rhuijben, brane, stefan2
-
* r1664997
Fix test failures when running from a directory whose name contains
characters which must be escaped when used in a URL.
Modified: subversion/branches/1.9.x/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/svnrdump/load_editor.c?rev=1667840&r1=1667839&r2=1667840&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/svnrdump/load_editor.c (original)
+++ subversion/branches/1.9.x/subversion/svnrdump/load_editor.c Thu Mar 19 18:24:11 2015
@@ -659,7 +659,8 @@ new_node_record(void **node_baton,
{
case svn_node_action_delete:
case svn_node_action_replace:
- SVN_ERR(commit_editor->delete_entry(nb->path, rb->rev - rb->rev_offset,
+ SVN_ERR(commit_editor->delete_entry(nb->path,
+ rb->rev - rb->rev_offset - 1,
rb->db->baton, rb->pool));
if (nb->action == svn_node_action_delete)
break;