# 
# 
# patch "ChangeLog"
#  from [b38f98cd1afb0281469db3e4d33f4469899444b7]
#    to [b35b0321b5e954e8e4c25987511725cf2d70ed1f]
# 
# patch "std_hooks.lua"
#  from [a79a91f2c0f63681bd1af81cfed00c2066cb362e]
#    to [55715d1a5035f6d594341f8383d4f2ce95896afb]
# 
============================================================
--- ChangeLog	b38f98cd1afb0281469db3e4d33f4469899444b7
+++ ChangeLog	b35b0321b5e954e8e4c25987511725cf2d70ed1f
@@ -1,3 +1,9 @@
+2006-03-07  Matthew Gregan  <address@hidden>
+
+	* std_hooks.lua (ignore_file): Fixup after introduction of
+	dir_matches() helper.  Visual SourceSafe stores metadata in named
+	files, not named directories.
+
 2006-03-06  Timothy Brownawell  <address@hidden>
 
 	* tests/t_push_with_upstream_epochs.at: Test that we don't hang on a
============================================================
--- std_hooks.lua	a79a91f2c0f63681bd1af81cfed00c2066cb362e
+++ std_hooks.lua	55715d1a5035f6d594341f8383d4f2ce95896afb
@@ -138,16 +138,18 @@
    -- Cons/SCons detritus:
    if dir_matches(name, ".consign") then return true end
    if dir_matches(name, ".sconsign") then return true end
-   -- other VCSes:
+   -- other VCSes (where metadata is stored in named dirs):
    if dir_matches(name, "CVS") then return true end
    if dir_matches(name, ".svn") then return true end
    if dir_matches(name, "SCCS") then return true end
    if dir_matches(name, "_darcs") then return true end
    if dir_matches(name, ".cdv") then return true end
    if dir_matches(name, ".git") then return true end
-   if dir_matches(name, ".scc") then return true end
    if dir_matches(name, ".bzr") then return true end
    if dir_matches(name, ".hg") then return true end
+   -- other VCSes (where metadata is stored in named files):
+   if (string.find(name, "^%.scc$")) then return true end
+   if (string.find(name, "/%.scc$")) then return true end
    -- desktop/directory configuration metadata
    if (string.find(name, "^.DS_Store$")) then return true end
    if (string.find(name, "/.DS_Store$")) then return true end