# 
# 
# patch "ChangeLog"
#  from [c25536fb7068b7acb11dc76c45393e9b5724808a]
#    to [a56e1798fcace6431cbbcbf0bb239c15cbee409b]
# 
# patch "contrib/monotone-import.pl"
#  from [b97f921ed2a341454d7fccd5d1f72ddec7b36244]
#    to [b00aab9fcb03d1f1fe39154b9b1035951e90533b]
# 
# patch "contrib/monotone-notify.pl"
#  from [d7f551f0f332f56785aaa59e99ade7400c8da84a]
#    to [f554383c51487d9804f2695f295e293f8a589345]
# 
============================================================
--- ChangeLog	c25536fb7068b7acb11dc76c45393e9b5724808a
+++ ChangeLog	a56e1798fcace6431cbbcbf0bb239c15cbee409b
@@ -1,3 +1,8 @@
+2006-03-28  Richard Levitte  <address@hidden>
+
+	* contrib/monotone-import.pl, contrib/monotone-import.pl: Change
+	MT to _MTN.
+
 2006-03-28  Nathaniel Smith  <address@hidden>
 
 	* tests/t_at_sign.at: Add a missing MTN_SETUP.
============================================================
--- contrib/monotone-import.pl	b97f921ed2a341454d7fccd5d1f72ddec7b36244
+++ contrib/monotone-import.pl	b00aab9fcb03d1f1fe39154b9b1035951e90533b
@@ -119,7 +119,7 @@
 ######################################################################
 # Check if this is a monotone work directory, and bail out if it is.
 #
-my $MT_dir = catdir(curdir(),"MT");
+my $MT_dir = catdir(curdir(),"_MTN");
 if (-d $MT_dir) {
     my_error("This is a monotone work directory, unsafe to import\n");
 }
@@ -206,7 +206,7 @@
 # Commit and tag.
 #
 my_system("monotone commit --message=\"$user_message\"");
-open REV,"MT/revision";
+open REV,catfile($MT_dir, "revision");
 my $newrev = <REV>;
 chomp $newrev;
 close REV;
============================================================
--- contrib/monotone-notify.pl	d7f551f0f332f56785aaa59e99ade7400c8da84a
+++ contrib/monotone-notify.pl	f554383c51487d9804f2695f295e293f8a589345
@@ -114,17 +114,17 @@
 # Make sure we have a database, and that the file spec is absolute.
 #
 
-# If no database is given, check the monotone options file (MT/options).
+# If no database is given, check the monotone options file (_MTN/options).
 # Do NOT use the branch option from there.
 if (!defined $user_database) {
     $root = rel2abs($root) if defined $root;
     $root = rootdir() unless defined $root;
 
     my $curdir = rel2abs(curdir());
-    while(! -f catfile($curdir, "MT", "options") && $curdir ne $root) {
+    while(! -f catfile($curdir, "_MTN", "options") && $curdir ne $root) {
 	$curdir = updir($curdir);
     }
-    my $options = catfile($curdir, "MT", "options");
+    my $options = catfile($curdir, "_MTN", "options");
 
     my_debug("found options file $options");
 
@@ -751,11 +751,11 @@
 =item B<--db>=I<database>
 
 Sets which database to use.  If not given, the database given in
-MT/options is used.
+_MTN/options is used.
 
 =item B<--root>=I<path>
 
-Stop the search for a working copy (containing the F<MT> directory) at
+Stop the search for a working copy (containing the F<_MTN> directory) at
 the specified root directory rather than at the physical root of the
 filesystem.