changelog

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 7d35892f7bb06d56ee8f093456d387716a848e8f..e274670d8ef580af84e1cbf4b7c07415e8ce06aa 100755 (executable)
--- a/mr
+++ b/mr
@@ -343,10 +343,9 @@ you can just add rcs specific actions for it.
 
 =head1 EXTENSIONS
 
-mr can be extended to support things such as unison and remote git
-checkout. Some files providing such extensions are available in
-/usr/share/mr/. See the documentation in the files for details about using
-them.
+mr can be extended to support things such as unison and git-svn. Some
+files providing such extensions are available in /usr/share/mr/. See
+the documentation in the files for details about using them.
 
 =head1 AUTHOR
 
@@ -419,7 +418,7 @@ sub rcs_test {
        chomp $rcs;
        if ($rcs=~/\n/s) {
                $rcs=~s/\n/, /g;
-               print STDERR "mr $action: found multiple possible repository types ($rcs) for $dir\n";
+               print STDERR "mr $action: found multiple possible repository types ($rcs) for $topdir$subdir\n";
                return undef;
        }
        if (! length $rcs) {
@@ -512,22 +511,22 @@ sub action {
        elsif (! defined $command) {
                my $rcs=rcs_test(@_);
                if (! defined $rcs) {
-                       print STDERR "mr $action: unknown repository type and no defined $action command for $dir\n";
+                       print STDERR "mr $action: unknown repository type and no defined $action command for $topdir$subdir\n";
                        return FAILED;
                }
                else {
-                       print STDERR "mr $action: no defined action for $rcs repository $dir, skipping\n";
+                       print STDERR "mr $action: no defined action for $rcs repository $topdir$subdir, skipping\n";
                        return SKIPPED;
                }
        }
        else {
                if (! $no_chdir) {
-                       print "mr $action: $dir\n" unless $quiet;
+                       print "mr $action: $topdir$subdir\n" unless $quiet;
                }
                else {
                        my $s=$directory;
-                       $s=~s/^\Q$dir\E\/?//;
-                       print "mr $action: $dir (in subdir $s)\n" unless $quiet;
+                       $s=~s/^\Q$topdir$subdir\E\/?//;
+                       print "mr $action: $topdir$subdir (in subdir $s)\n" unless $quiet;
                }
                $command="set -e; ".$lib.
                        "my_action(){ $command\n }; my_action ".