Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 079956481 for ; Thu, 26 May 2011 12:21:22 +0000 (UTC) Received: (qmail 19310 invoked by uid 500); 26 May 2011 12:21:22 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 19255 invoked by uid 500); 26 May 2011 12:21:21 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 19248 invoked by uid 99); 26 May 2011 12:21:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 12:21:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 12:21:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7262123889E7; Thu, 26 May 2011 12:20:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1127885 - /subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Date: Thu, 26 May 2011 12:20:58 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110526122058.7262123889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Thu May 26 12:20:58 2011 New Revision: 1127885 URL: http://svn.apache.org/viewvc?rev=1127885&view=rev Log: Fix issue #2794, svn_load_dirs.pl: execute bit on files triggers an "add" I could reproduce the problem and verify that the provided patch fixes it. * contrib/svn_load_dirs/svn_load_dirs.pl.in: Apply the svn:executable property only to newly added files. Patch by: Mark Reibert (Tweaked by cmpilato.) Modified: subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Modified: subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in?rev=1127885&r1=1127884&r2=1127885&view=diff ============================================================================== --- subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in (original) +++ subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Thu May 26 12:20:58 2011 @@ -1039,17 +1039,16 @@ while (defined (my $load_dir = &get_next last if $property->{control} eq 'break'; } } - } - - # Add svn:executable to files that have their executable bit - # set. - if ($source_is_exe and !$opt_no_auto_exe) - { - print "Adding to '$source_path' property 'svn:executable' with ", - "value '*'.\n"; - my $property = {name => 'svn:executable', value => '*'}; - push (@{$add_files{$source_path}{properties}}, - $property); + # Add svn:executable to files that have their executable + # bit set. + if ($source_is_exe and !$opt_no_auto_exe) + { + print "Adding to '$source_path' property 'svn:executable' ", + "with value '*'.\n"; + my $property = {name => 'svn:executable', value => '*'}; + push (@{$add_files{$source_path}{properties}}, + $property); + } } # Now make sure the file or directory in the source directory