From 1d2906e6300af29ba4385f8660f1b3a6a3c6e95e Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 4 Dec 2007 05:24:29 +0000
Subject: [PATCH] Don't search for ".bzr" in parent directories if some other
 version-control system is available for the current directory.

---
 v7/src/edwin/vc.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/v7/src/edwin/vc.scm b/v7/src/edwin/vc.scm
index 9bf5aab33..e38da3e66 100644
--- a/v7/src/edwin/vc.scm
+++ b/v7/src/edwin/vc.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: vc.scm,v 1.104 2007/12/04 05:21:51 cph Exp $
+$Id: vc.scm,v 1.105 2007/12/04 05:24:29 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -2339,18 +2339,19 @@ the value of vc-log-mode-hook."
 (define-vc-type-operation 'FIND-MASTER vc-type:bzr
   (lambda (workfile)
     (let ((make-master
-	    (lambda ()
+	    (lambda (dir)
 	      (make-vc-master vc-type:bzr
 			      (merge-pathnames "README" dir)
-			      workfile))))
-      (if (and (file-directory? (subdirectory-pathname workfile ".bzr"))
+			      workfile)))
+	  (dir (subdirectory-pathname workfile ".bzr")))
+      (if (and (file-directory? dir)
 	       (%bzr-workfile-versioned? workfile))
-	  (make-master)
+	  (make-master dir)
 	  (lambda ()
 	    (let ((dir (bzr-directory workfile)))
 	      (and dir
 		   (%bzr-workfile-versioned? workfile)
-		   (make-master))))))))
+		   (make-master dir))))))))
 
 (define-vc-type-operation 'VALID? vc-type:bzr
   (lambda (master)
-- 
2.25.1