You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/03/26 16:57:52 UTC
svn commit: r927941 - in /subversion/branches/1.6.x-r926151: ./ CHANGES
subversion/libsvn_fs_fs/fs_fs.c
Author: pburba
Date: Fri Mar 26 15:57:52 2010
New Revision: 927941
URL: http://svn.apache.org/viewvc?rev=927941&view=rev
Log:
On the 1.6.x-r926121 branch: Merge r926167 from trunk.
Modified:
subversion/branches/1.6.x-r926151/ (props changed)
subversion/branches/1.6.x-r926151/CHANGES (props changed)
subversion/branches/1.6.x-r926151/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.6.x-r926151/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 26 15:57:52 2010
@@ -65,4 +65,4 @@
/subversion/branches/tc_url_rev:870696-870828
/subversion/branches/tree-conflicts:864636-869499
/subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,876862,877016,877203,877595,877597,877665,878216,878269,878321,878341,878343,878399,878423,878426,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,917640,918211,922516,926151,927323,927328
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,876862,877016,877203,877595,877597,877665,878216,878269,878321,878341,878343,878399,878423,878426,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,917640,918211,922516,926151,926167,927323,927328
Propchange: subversion/branches/1.6.x-r926151/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 26 15:57:52 2010
@@ -64,4 +64,4 @@
/subversion/branches/tc_url_rev/CHANGES:870696-870828
/subversion/branches/tree-conflicts/CHANGES:864636-869499
/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,922516,926151,927323,927328
+/subversion/trunk/CHANGES:875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,922516,926151,926167,927323,927328
Modified: subversion/branches/1.6.x-r926151/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r926151/subversion/libsvn_fs_fs/fs_fs.c?rev=927941&r1=927940&r2=927941&view=diff
==============================================================================
--- subversion/branches/1.6.x-r926151/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.6.x-r926151/subversion/libsvn_fs_fs/fs_fs.c Fri Mar 26 15:57:52 2010
@@ -3698,6 +3698,15 @@ fold_change(apr_hash_t *changes,
(SVN_ERR_FS_CORRUPT, NULL,
_("Invalid change ordering: non-add change on deleted path"));
+ /* Sanity check: an add can't follow anything except
+ a delete or reset. */
+ if ((change->kind == svn_fs_path_change_add)
+ && (old_change->change_kind != svn_fs_path_change_delete)
+ && (old_change->change_kind != svn_fs_path_change_reset))
+ return svn_error_create
+ (SVN_ERR_FS_CORRUPT, NULL,
+ _("Invalid change ordering: add change on preexisting path"));
+
/* Now, merge that change in. */
switch (change->kind)
{