[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: FSFS bug with mixed revision commit

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-05-17 00:03:29 CEST

Philip Martin <philip@codematters.co.uk> writes:

>> pl@fnapp:~/svntest/wc$ echo hoj > a/f
>> pl@fnapp:~/svntest/wc$ svn cp a $R/b -m 'mixed wc copy'
>> subversion/libsvn_client/copy.c:544: (apr_err=160004)
>> svn: Commit failed (details follow):
>> subversion/libsvn_fs_fs/fs_fs.c:1973: (apr_err=160004)
>> svn: Invalid change ordering: new node revision ID without delete
>
> The commit fails over ra_local and ra_svn, but works over
> ra_dav. Here's what ra_dav commits:

The following patch allows the commit to succeed, but since
harvest_committables is so complicated I don't know if it's really
correct:

Index: subversion/libsvn_client/commit_util.c
===================================================================
--- subversion/libsvn_client/commit_util.c (revision 14756)
+++ subversion/libsvn_client/commit_util.c (working copy)
@@ -382,6 +382,7 @@
       if (entry->revision != p_rev)
         {
           state_flags |= SVN_CLIENT_COMMIT_ITEM_ADD;
+ state_flags |= SVN_CLIENT_COMMIT_ITEM_DELETE;
           state_flags |= SVN_CLIENT_COMMIT_ITEM_IS_COPY;
           adds_only = FALSE;
           cf_rev = entry->revision;

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 17 00:04:18 2005

This is an archived mail posted to the Subversion Dev mailing list.