From dev-return-875-daniel=haxx.se@subversion.apache.org Tue Jan 5 14:38:34 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 o05DcWWr021650 for ; Tue, 5 Jan 2010 14:38:33 +0100 Received: (qmail 41402 invoked by uid 500); 5 Jan 2010 13:38:28 -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 41392 invoked by uid 99); 5 Jan 2010 13:38:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 13:38:28 +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 codematters@ntlworld.com designates 81.103.221.48 as permitted sender) Received: from [81.103.221.48] (HELO mtaout02-winn.ispmail.ntl.com) (81.103.221.48) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 13:38:18 +0000 Received: from aamtaout01-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout02-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20100105133758.TTBY27507.mtaout02-winn.ispmail.ntl.com@aamtaout01-winn.ispmail.ntl.com>; Tue, 5 Jan 2010 13:37:58 +0000 Received: from stat.home.lan ([86.16.124.205]) by aamtaout01-winn.ispmail.ntl.com (InterMail vG.2.02.00.01 201-2161-120-102-20060912) with ESMTP id <20100105133758.VASG13254.aamtaout01-winn.ispmail.ntl.com@stat.home.lan>; Tue, 5 Jan 2010 13:37:58 +0000 Received: by stat.home.lan (Postfix, from userid 1000) id E9A9B4DAB3; Tue, 5 Jan 2010 13:37:55 +0000 (GMT) To: Kannan Cc: SVN Dev Subject: Re: [PATCH][v2] Sticky depths should work for an excluded dir References: <4B2FB0A6.8060809@collab.net> <4B39914E.1040605@collab.net> <4B3A00A5.6050305@collab.net> From: Philip Martin Date: Tue, 05 Jan 2010 13:37:55 +0000 In-Reply-To: <4B3A00A5.6050305@collab.net> (Kannan's message of "Tue\, 29 Dec 2009 18\:44\:13 +0530") Message-ID: <871vi4u0y4.fsf@stat.home.lan> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Cloudmark-Analysis: v=1.1 cv=W3tOLUehizD4qj6VhtReFuw5MKb8d+XqjIxlDsIazEA= c=1 sm=0 a=-j2t0-ZD_csA:10 a=KmIT7ip4AAAA:8 a=YxA-BiLypLpEosb0K0MA:9 a=REAkABBVU5kx9axocHwA:7 a=_yt5Cq4pt7830So2MgQmtYprFg8A:4 a=aLiJ42VE6YQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 X-Virus-Checked: Checked by ClamAV on apache.org Kannan writes: > Make `--set-depth (empty|files|immediates) DIR' work, where DIR's depth > had already been set as `exclude'. Only `infinity' works as of now. > > * subversion/libsvn_wc/crop.c > (svn_wc_crop_tree2): Check the 'base status' of the node here and > remove the check done using `svn_wc__db_node_hidden()' as it > marks a node as 'hidden' if status is set as > `svn_wc__db_status_excluded'. > > * update_editor.c > (complete_directory): Call `svn_wc__set_depth' with the requested > depth rather than `infinity' by default. > > * entries.c > (svn_wc__set_depth): Set the entry's depth to the requested one rather > than `infinity' by default if the depth is not `exclude'. > > * wc_db.c > (svn_wc__db_temp_op_dir_set_depth): Remove the code which sets the > depth as `infinity' if the depth is not `exclude'. > > Patch by: Kannan R It looks plausible, but it would be much better if you included a regression test that exercised the new code. If you fix something like this without adding a test there is no guarantee that some future change won't break it. -- Philip