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

  directory.

diff --git a/debian/changelog b/debian/changelog
index bc3b4e65583f4a1be3f652d15ca2ca56a1c5a419..e0214f32798a73b7b72a2a83c6769289f9c71add 100644 (file)
--- 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 9501322e7a6d04004266f4a21bdc64136dc2dfc2..62c6be83af2c6dd015fb8cf7aa5104b999af732f 100755 (executable)
--- 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;
        }