[svk-commit] r2975 - in trunk: t

[nobody at bestpractical.com]

Author: ruz
Date: Sun Jul  6 04:44:30 2008
New Revision: 2975

Modified:
   trunk/lib/SVK/Editor/XD.pm
   trunk/t/07smerge-external.t

Log:
* use adjust_only on updates

Modified: trunk/lib/SVK/Editor/XD.pm
==============================================================================
--- trunk/lib/SVK/Editor/XD.pm	(original)
+++ trunk/lib/SVK/Editor/XD.pm	Sun Jul  6 04:44:30 2008
@@ -296,25 +296,25 @@
     $self->{props}{$path}{$name} = $value
 	if $self->{added}{$path};
     return if $self->{check_only};
+
     my $copath = $path;
     $self->{get_copath}($copath);
-    if ($self->{update}) {
-	$self->{exe}{$path} = $value
-	    if $name eq 'svn:executable';
-    }
-    else {
-        $self->{get_path}($path);
-        $self->{xd}->do_propset(
-            $self->{xd}->create_path_object(
-                copath_anchor => $copath,
-                path          => $path,
-                repos         => $self->{repos}
-            ),
-            quiet     => 1,
-            propname  => $name,
-            propvalue => $value,
-        );
-    }
+
+    $self->{exe}{$path} = $value
+        if $name eq 'svn:executable' && $self->{update};
+
+    $self->{get_path}($path);
+    $self->{xd}->do_propset(
+        $self->{xd}->create_path_object(
+            copath_anchor => $copath,
+            path          => $path,
+            repos         => $self->{repos}
+        ),
+        quiet     => 1,
+        propname  => $name,
+        propvalue => $value,
+        adjust_only => $self->{update},
+    );
 }
 
 sub change_dir_prop {

Modified: trunk/t/07smerge-external.t
==============================================================================
--- trunk/t/07smerge-external.t	(original)
+++ trunk/t/07smerge-external.t	Sun Jul  6 04:44:30 2008
@@ -66,7 +66,8 @@
 	   ], 'svk-merge mine');
 is_output ($svk, 'up', ["$copath"],
 	   ["Syncing //local(/local) in $corpath to 6.",
-	    __"g   $copath/test.pl"], 'svk-merge theirs');
+	    __"g   $copath/test.pl",
+	    __" g  $copath"], 'svk-merge theirs');
 
 overwrite_file ("$copath/test.pl", "#!/usr/bin/perl -T -w\nsub { 'this is sub on trunk' }\n#local\n#common\n\nsub newsub { undef }\n");
 $svk->commit ('-m', 'change on local', $copath);