subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
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 GMT
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 <svn@reibert.com>
          (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



Mime
View raw message