subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Kannan <kann...@collab.net>
Subject Re: [PATCH] Fix #3544 - svn update does not restore excluded files
Date Mon, 11 Jan 2010 13:36:22 GMT
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Philip Martin wrote:
[..]
>> Index: subversion/libsvn_wc/entries.c
>> ===================================================================
>> --- subversion/libsvn_wc/entries.c	(revision 896759)
>> +++ subversion/libsvn_wc/entries.c	(working copy)
>> @@ -177,6 +177,11 @@
>>      {
>>        dst->uuid = src->uuid;
>>      }
>> +
>> +  /* We need to bring back the FILE as versioned */
>> +  if (dst->depth == svn_depth_exclude)
>> +    dst->depth = svn_depth_infinity;
>> +
> 
> take_from_entry is about copying from SRC to DST but here you are not
> copying SRC.  Should that be src->depth instead of svn_depth_infinity?
> If svn_depth_infinity is correct then perhaps this bit of code should
> be moved to the call site.

src->depth could hold files/immediates/infinity. A file defaults only to
depth infinity, right? Please CMIIW. In that case, will move the change
to where the call occurs.

> 
>>  }
>>  
>>  static svn_error_t *
>> Index: subversion/tests/cmdline/depth_tests.py
>> ===================================================================
>> --- subversion/tests/cmdline/depth_tests.py	(revision 896759)
>> +++ subversion/tests/cmdline/depth_tests.py	(working copy)
>> @@ -2537,7 +2537,7 @@
>>                pull_in_tree_with_depth_option,
>>                fold_tree_with_unversioned_modified_items,
>>                depth_empty_update_on_file,
>> -              XFail(excluded_path_update_operation),
>> +              excluded_path_update_operation,
> 
> That test contains comments about the XFail that need to be updated/removed.

Thank you Philip, for the comments. I'll include this change too in the
next version of the patch.

> 
>>                excluded_path_misc_operation,
>>                excluded_receive_remote_removal,
>>                exclude_keeps_hidden_entries,
>>
> 


- --
Thanks & Regards,
Kannan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEVAwUBS0spVnlTqcY7ytmIAQKzCgf8CCV8Ft6+PILnQTcxpgxF7X3lGheOuQqU
Ot4D097F9PYJn8m1RALtBpLFjmqWc2hQIvnIwpbb4c8o0H2l0RJ+fEbQwkdDKgiZ
M3hX4G7Vpcuss2Xfp0vYS12XoYLo+zcC1Rar8RHKGnJeXY9KxF5AbbfRKujO11Ef
A791F/Em0sNRAtoOPWbgWAAdJMQwzLpa9TsTMr4UVDSRLveSGEp3NilSbPWBEdQn
mQ6pn/2cc6txkaFOVQtmdkeYTDGcdrPL1NpJUwcL0zbgsKfvCr/Jhb19Sni/3B+7
ZdqBkrjqey9TYyo1ZTxWv/eo/7aL1PqV/RXAJfjPyzKXQ5a/2okLtQ==
=6NJE
-----END PGP SIGNATURE-----

Mime
View raw message