subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "C. Michael Pilato" <cmpil...@collab.net>
Subject Re: [PATCH] Fix #3544 - svn update does not restore excluded files
Date Thu, 14 Jan 2010 17:19:12 GMT
Kannan wrote:
> Kannan wrote:
> [..]
> 
> Attaching herewith is the updated patch, as per Philip's feedback.
> 
> [[[
> Log:
> Fix issue #3544 -- svn update does not restore excluded files.
> 
> * subversion/libsvn_wc/update_editor.c
>   (complete_directory): Call `svn_wc__set_depth()' with the requested
>    depth and with `infinity' only when the depth value is `unknown'.
> 
> * subversion/libsvn_wc/entries.c
>   (fold_entry): Set the default depth of the FILE (as
>    `infinity') had the file been excluded already.
> 
> * subversion/tests/cmdline/depth_tests.py
>   (excluded_path_update_operation): Remove the obsolete XFail comments.
> 
>   (test_list): Remove the XFail on `excluded_path_update_operation'.
> 
> Suggested by: philip
> Patch by: Kannan R <kannanr@collab.net>
> ]]]
> 

This patch doesn't apply cleanly anymore because I committed one of you
other ones.  The conflict is pretty easy to resolve, though.

That said, I don't understand the changes to fold_entry().  The function's
purpose is to modify an entry_t by copying a subset of fields from another
entry_t.  It seems an odd place to put code that tweaks that entry_t's
"depth" field without respect to either the source entry_t's value or to the
flagset that dictates which fields to modify.


-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand


Mime
View raw message