[svk-commit] r2312 - in trunk: lib/SVK/Command

nobody at bestpractical.com nobody at bestpractical.com
Tue Mar 6 07:09:18 EST 2007


Author: clkao
Date: Tue Mar  6 07:09:13 2007
New Revision: 2312

Modified:
   trunk/MANIFEST
   trunk/lib/SVK/Command/Update.pm

Log:
Make updating a checkout that no longer exists in the depot give
proper message.

Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST	(original)
+++ trunk/MANIFEST	Tue Mar  6 07:09:13 2007
@@ -286,6 +286,7 @@
 t/mirror/sync-replaced-nocopy.t
 t/mirror/sync-replaced.t
 t/mirror/sync-replicate.t
+t/update-gone.t
 t/svk-sec.gpg
 t/svk.gpg
 utils/extract-docs

Modified: trunk/lib/SVK/Command/Update.pm
==============================================================================
--- trunk/lib/SVK/Command/Update.pm	(original)
+++ trunk/lib/SVK/Command/Update.pm	Tue Mar  6 07:09:13 2007
@@ -155,13 +155,15 @@
 	# something that exist.
 	die loc("Path %1 does not exist.\n", $update_target->depotpath)
 	    unless $xdroot->check_path($cotarget->path);
-
 	$cotarget->anchorify;
-	$update_target->anchorify;
 	# still in the checkout
 	if ($self->{xd}{checkout}->get($cotarget->copath)->{depotpath}) {
+	    $update_target->anchorify;
 	    $kind = $newroot->check_path($update_target->path_anchor);
 	}
+	else {
+	    die loc("Path %1 no longer exists.\n", $update_target->depotpath);
+	}
     }
 
     my $content_revision = $update_target->isa('SVK::Path::View') ?


More information about the svk-commit mailing list