[svk-commit] r2328 - branches/2.0-releng/lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Wed Mar 14 19:57:45 2007
New Revision: 2328

Modified:
   branches/2.0-releng/lib/SVK/Util.pm

Log:
Merge from trunk:
 r2301 at trunk:  mndrix | 2007-02-23 15:54:24 +0000
 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: branches/2.0-releng/lib/SVK/Util.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Util.pm	(original)
+++ branches/2.0-releng/lib/SVK/Util.pm	Wed Mar 14 19:57:45 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();
     }