From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 3 Nov 2007 02:42:51 +0000 (-0400)
Subject: * Better error message if more than one repo type test matches a single
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/311c6efa8e64a24f406955373eff67e4a35ad0c0?ds=sidebyside

* Better error message if more than one repo type test matches a single
  directory.
---

diff --git a/debian/changelog b/debian/changelog
index bc3b4e6..e0214f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ mr (0.11) UNRELEASED; urgency=low
   * Avoid using commands like git-config and instead use "git config".
     In some configurations, only the main git command is in the path.
   * Allow option bundling, mostly so "-j2" will work.
+  * Better error message if more than one repo type test matches a single
+    directory.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 01 Nov 2007 23:52:50 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 02 Nov 2007 22:41:44 -0400
 
 mr (0.10) unstable; urgency=low
 
diff --git a/mr b/mr
index 9501322..62c6be8 100755
--- a/mr
+++ b/mr
@@ -343,6 +343,11 @@ sub rcs_test { #{{{
 	print "mr $action: running rcs test >>$test<<\n" if $verbose;
 	my $rcs=`$test`;
 	chomp $rcs;
+	if ($rcs=~/\n/s) {
+		$rcs=~s/\n/, /g;
+		print STDERR "mr $action: found multiple possible repository types ($rcs) for $topdir$subdir\n";
+		return undef;
+	}
 	if (! length $rcs) {
 		return undef;
 	}