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

[PATCH] Bug merging propchanges into a deleted file

From: Peter S. Housel <housel_at_acm.org>
Date: 2004-11-11 20:50:55 CET

Here's a patch to fix a problem with merging propchanges into deleted
files. The merge_props_changed() function handles, and explicitly
ignores, the SVN_ERR_ENTRY_NOT_FOUND error, but it doesn't handle the
SVN_ERR_ENTRY_NOT_FOUND error thrown by svn_wc_merge_prop_diffs().

I'm not sure if this is the right fix, or if the choice of errors thrown
should be more consistent. (It seems like an arbitrary distinction to

Properly handle the merging of property changes into a deleted file.

* subversion/libsvn_client/diff.c
  (merge_props_changed): Filter SVN_ERR_UNVERSIONED_RESOURCE errors
  as well as SVN_ERR_ENTRY_NOT_FOUND errors.

Index: subversion/libsvn_client/diff.c
--- subversion/libsvn_client/diff.c (revision 11834)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1142,7 +1142,8 @@
       err = svn_wc_merge_prop_diffs (state, path, adm_access, props,
                                      FALSE, merge_b->dry_run, subpool);
- if (err && (err->apr_err == SVN_ERR_ENTRY_NOT_FOUND))
+ if (err && (err->apr_err == SVN_ERR_ENTRY_NOT_FOUND
+ || err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE))
           /* if the entry doesn't exist in the wc, just 'skip' over
              this part of the tree-delta. */

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 11 20:51:08 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.