From dev-return-1057-daniel=haxx.se@subversion.apache.org Mon Jan 11 14:43:47 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o0BDhkNp023278 for ; Mon, 11 Jan 2010 14:43:46 +0100 Received: (qmail 46010 invoked by uid 500); 11 Jan 2010 13:43:41 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 46000 invoked by uid 99); 11 Jan 2010 13:43:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jan 2010 13:43:41 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of kannanr@collab.net designates 204.16.106.198 as permitted sender) Received: from [204.16.106.198] (HELO sp-exchfea.sp.corp.collab.net) (204.16.106.198) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jan 2010 13:43:31 +0000 Received: from [10.2.1.62] ([208.87.9.2]) by sp-exchfea.sp.corp.collab.net with Microsoft SMTPSVC(6.0.3790.3959); Mon, 11 Jan 2010 05:43:09 -0800 Message-ID: <4B4B2956.5050808@collab.net> Date: Mon, 11 Jan 2010 19:06:22 +0530 From: Kannan User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Philip Martin CC: SVN Dev Subject: Re: [PATCH] Fix #3544 - svn update does not restore excluded files References: <4B4AAAC5.1050209@collab.net> <87ljg4svhw.fsf@stat.home.lan> In-Reply-To: <87ljg4svhw.fsf@stat.home.lan> X-Enigmail-Version: 0.96.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 11 Jan 2010 13:43:09.0917 (UTC) FILETIME=[033EC0D0:01CA92C4] X-Virus-Checked: Checked by ClamAV on apache.org -----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-----