[svk-commit] r2301 - trunk/lib/SVK

[nobody at bestpractical.com]

Author: mndrix
Date: Fri Feb 23 10:54:24 2007
New Revision: 2301

Modified:
   trunk/lib/SVK/Util.pm

Log:
Check for .svk/floating before assuming floating checkout.

find_dotsvk() now checks for the existence of a file .svk/floating before
assuming that the .svk directory is for a floating checkout.  Since many users
have $HOME/.svk, this bug could cause the $SVKROOT environment to be ignored.

Modified: trunk/lib/SVK/Util.pm
==============================================================================
--- trunk/lib/SVK/Util.pm	(original)
+++ trunk/lib/SVK/Util.pm	Fri Feb 23 10:54:24 2007
@@ -969,7 +969,7 @@
     while ( $p && $p ne $prev && -r $p ) {
 	$prev = $p;
 	my $svk = $p->subdir('.svk');
-	return $svk if -e $svk;
+	return $svk if -e $svk && -e $svk->file('floating');
 	$p = $p->parent();
     }