* Fix mr register to work when -c is specified using a relative path and

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 50564f7420c7811e5772215910e96b46af88bf01..e735b67b7335ce262ea327075636122ede8058f4 100755 (executable)
--- a/mr
+++ b/mr
@@ -34,7 +34,7 @@ a set of repositories as if they were one combined respository. It
 supports any combination of subversion, git, cvs, and bzr repositories, 
 and support for other revision control systems can easily be added.
 
 supports any combination of subversion, git, cvs, and bzr repositories, 
 and support for other revision control systems can easily be added.
 

-B<mr> cds into and operates on all registered repsitories at or below your
+B<mr> cds into and operates on all registered repositories at or below your

 working directory. Or, if you are in a subdirectory of a repository that
 contains no other registered repositories, it will stay in that directory,
 and work on only that repository,
 working directory. Or, if you are in a subdirectory of a repository that
 contains no other registered repositories, it will stay in that directory,
 and work on only that repository,


@@ -87,9 +87,12 @@ List the repositories that mr will act on.
 =item register
 
 Register an existing repository in the mrconfig file. By default, the
 =item register
 
 Register an existing repository in the mrconfig file. By default, the

-epository in the current directory is registered, or you can specify a
+repository in the current directory is registered, or you can specify a

 directory to register.
 
 directory to register.
 

+By default it registers it to the ~/.mrconfig file. To make it write to a
+different file, use the -c option.
+

 =item config
 
 Adds, modifies, removes, or prints a value from the mrconfig file. The next
 =item config
 
 Adds, modifies, removes, or prints a value from the mrconfig file. The next


@@ -218,7 +221,7 @@ should avoid chaining from repositories with untrusted committers.)
 
 If the "deleted" parameter is set and its command returns nonzero, then
 B<mr> will treat the repository as deleted. It won't ever actually delete
 
 If the "deleted" parameter is set and its command returns nonzero, then
 B<mr> will treat the repository as deleted. It won't ever actually delete

-the repository, but it will warn if it sees the repsoitory's directory.
+the repository, but it will warn if it sees the repository's directory.

 This is useful when one mrconfig file is shared amoung multiple machines,
 to keep track of and remember to delete old repositories.
 
 This is useful when one mrconfig file is shared amoung multiple machines,
 to keep track of and remember to delete old repositories.
 


@@ -258,7 +261,7 @@ my %alias;
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },

-       "c|config=s" => \$ENV{MR_CONFIG},
+       "c|config=s" => sub { $ENV{MR_CONFIG}=abs_path($_[1]) },

        "v|verbose" => \$verbose,
        "s|stats" => \$stats,
 );
        "v|verbose" => \$verbose,
        "s|stats" => \$stats,
 );