Author: philip
Date: Fri Jul 30 14:04:47 2010
New Revision: 980797
URL: http://svn.apache.org/viewvc?rev=980797&view=rev
Log:
* subversion/libsvn_wc/adm_files.c
(svn_wc__internal_ensure_adm): Treat not-present like deleted, this
makes copy_tests 21 get a bit further.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=980797&r1=980796&r2=980797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Fri Jul 30 14:04:47 2010
@@ -637,7 +637,8 @@ svn_wc__internal_ensure_adm(svn_wc__db_t
* arbitrary revision and the URL may differ if the add is
* being driven from a merge which will have a different URL. */
if (status != svn_wc__db_status_deleted
- && status != svn_wc__db_status_obstructed_delete)
+ && status != svn_wc__db_status_obstructed_delete
+ && status != svn_wc__db_status_not_present)
{
/* ### Should we match copyfrom_revision? */
if (db_revision != revision)
