# 
# 
# rename "tests/t_mt_ignore.at"
#     to "tests/t_mtn_ignore.at"
# 
# patch "ChangeLog"
#  from [663c7d404c8db3a4c00289d1ac3248c5a383e0cc]
#    to [22aac7913f310e1759a5ac4ccc9522a422d482ea]
# 
# patch "monotone.texi"
#  from [f9099918e9f78b6c10f50d00a02b8ea47b46d452]
#    to [d125cacd4d67d79ae1c6dfe0ba528f9b318468cd]
# 
# patch "std_hooks.lua"
#  from [fbc926cf5b9a833b55bd1c7a3792a98f93b15493]
#    to [2132ef81f479c781999ff449d0783e9342bb5c1b]
# 
# patch "tests/t_add.at"
#  from [d4d8b57976ea08bcc1167c9229dad035ece38a06]
#    to [abbf834c5ada175ea06f808970539f3bd18cc124]
# 
# patch "tests/t_mtn_ignore.at"
#  from [3d4606633315af1837c5377d57152b6cd014e837]
#    to [7bf60f0af1a7c0a57f79ea1e72f5b8fba055afd9]
# 
# patch "testsuite.at"
#  from [3b0beb18b493ab5aac53fdec0411f8fdbec273cd]
#    to [d1fe08ed898b6221d4611cacb163288d76221b55]
# 
============================================================
--- ChangeLog	663c7d404c8db3a4c00289d1ac3248c5a383e0cc
+++ ChangeLog	22aac7913f310e1759a5ac4ccc9522a422d482ea
@@ -1,5 +1,12 @@
 2006-03-28  Nathaniel Smith  <address@hidden>
 
+	* std_hooks.lua (ignore_file): Read .mtn-ignore, not .mt-ignore.
+	* tests/t_mt_ignore.at, tests/t_add.at, testsuite.at: Adjust
+	accordingly.
+	* monotone.texi: Update accordingly.
+
+2006-03-28  Nathaniel Smith  <address@hidden>
+
 	* tests/t_case_insensitive__MTN.at, testsuite.at: New test.
 
 2006-03-28  Nathaniel Smith  <address@hidden>
============================================================
--- monotone.texi	f9099918e9f78b6c10f50d00a02b8ea47b46d452
+++ monotone.texi	d125cacd4d67d79ae1c6dfe0ba528f9b318468cd
@@ -2999,7 +2999,7 @@
 
 @table @asis
 @item Versioned control files
-Any file name beginning with @file{.mt-}
+Any file name beginning with @file{.mtn-}
 @item Non-versioned control files
 Any file in the directory @file{_MTN/}
 @end table
@@ -3010,10 +3010,7 @@
 in the future, but they will follow the patterns given above.
 
 @table @file
address@hidden .mt-attrs
-Contains versioned attributes of files, associated with the files'
-pathnames.
address@hidden .mt-ignore
address@hidden .mtn-ignore
 Contains a list of regular expression patterns, one per line. If it exists,
 any file with a name matching one of these patterns is ignored.
 @item _MTN/wanted-testresults
@@ -6291,7 +6288,7 @@
 
 The default definition of this hook recognises a number of common file
 types and extensions for temporary and generated file types that users
-typically don't want to track. If the file @file{.mt-ignore} exists,
+typically don't want to track. If the file @file{.mtn-ignore} exists,
 this hook will read a list of regular expressions from the file, one per
 line, and ignore all files matching one of these expressions. For the
 default definition of this hook, see @ref{Default hooks}.
============================================================
--- std_hooks.lua	fbc926cf5b9a833b55bd1c7a3792a98f93b15493
+++ std_hooks.lua	2132ef81f479c781999ff449d0783e9342bb5c1b
@@ -84,7 +84,7 @@
    -- project specific
    if (ignored_files == nil) then
       ignored_files = {}
-      local ignfile = io.open(".mt-ignore", "r")
+      local ignfile = io.open(".mtn-ignore", "r")
       if (ignfile ~= nil) then
          local line = ignfile:read()
          while (line ~= nil)
@@ -102,8 +102,8 @@
           -- no error from the regex.search call
           if result == true then return true end
       else
-          -- regex.search had a problem, warn the user their .mt-ignore file syntax is wrong
-          io.stderr:write("WARNING: the line '" .. line .. "' in your .mt-ignore file caused error '" .. result .. "'"
+          -- regex.search had a problem, warn the user their .mtn-ignore file syntax is wrong
+          io.stderr:write("WARNING: the line '" .. line .. "' in your .mtn-ignore file caused error '" .. result .. "'"
                            .. " while matching filename '" .. name .. "'.\nignoring this regex for all remaining files.\n")
           table.remove(ignored_files, i)
       end
============================================================
--- tests/t_add.at	d4d8b57976ea08bcc1167c9229dad035ece38a06
+++ tests/t_add.at	abbf834c5ada175ea06f808970539f3bd18cc124
@@ -60,7 +60,7 @@
 AT_CHECK(mkdir dir2)
 AT_DATA(dir2/file7, [file 7
 ])
-#AT_DATA(.mt-ignore, [.*\.ignore$
+#AT_DATA(.mtn-ignore, [.*\.ignore$
 #])
 
 #AT_CHECK(RAW_MTN ls unkown, [], [stdout], [ignore])
============================================================
--- tests/t_mt_ignore.at	3d4606633315af1837c5377d57152b6cd014e837
+++ tests/t_mtn_ignore.at	7bf60f0af1a7c0a57f79ea1e72f5b8fba055afd9
@@ -1,4 +1,4 @@
-AT_SETUP([things in .mt-ignore get ignored])
+AT_SETUP([things in .mtn-ignore get ignored])
 
 MTN_SETUP
 
@@ -7,7 +7,7 @@
 AT_CHECK(mkdir baz)
 AT_CHECK(touch baz/xyzzy)
 
-AT_DATA(.mt-ignore, [bar
+AT_DATA(.mtn-ignore, [bar
 baz
 *.d
 ])
@@ -31,7 +31,7 @@
 AT_CHECK(grep bar ignored, [], [ignore])
 AT_CHECK(grep xyzzy ignored, [], [ignore])
 
-AT_CHECK(rm .mt-ignore)
+AT_CHECK(rm .mtn-ignore)
 AT_CHECK(RAW_MTN ls ignored, [], [stdout], [stderr])
 AT_CHECK(grep test.db stdout, [], [ignore])
 
============================================================
--- testsuite.at	3b0beb18b493ab5aac53fdec0411f8fdbec273cd
+++ testsuite.at	d1fe08ed898b6221d4611cacb163288d76221b55
@@ -812,7 +812,7 @@
 m4_include(tests/t_rename_execute.at)
 m4_include(tests/t_read_from_file.at)
 m4_include(tests/t_setup_existing_path.at)
-m4_include(tests/t_mt_ignore.at)
+m4_include(tests/t_mtn_ignore.at)
 m4_include(tests/t_automate_get_file.at)
 m4_include(tests/t_automate_get_manifest_of.at)
 m4_include(tests/t_automate_get_revision.at)