# 
# 
# patch "ChangeLog"
#  from [2a9e5696c19bebec7c4ba7d2d02452eb5f75e44a]
#    to [dccdde6a7705f788ca06f5af11272278b30d882f]
# 
# patch "cmd_merging.cc"
#  from [4322d0bff3147c7f9493ff3e5e0ba356bb97d4b3]
#    to [53f666567a77400a9e8bb65637801cdd0f20a60b]
# 
# patch "std_hooks.lua"
#  from [d58c9f82407bd774bca64fcdae804f8881c80ff1]
#    to [4865ef1cffe53cd529104488cd7adac8eaa30563]
# 
============================================================
--- ChangeLog	2a9e5696c19bebec7c4ba7d2d02452eb5f75e44a
+++ ChangeLog	dccdde6a7705f788ca06f5af11272278b30d882f
@@ -1,10 +1,17 @@
+2006-06-12  Derek Scherger  <address@hidden>
+
+	* cmd_merging.cc (get_roster): allow no arguments and default to
+	value in _MTN/revision
+	* std_hooks.lua: switch temporary file names from mt.XXX to
+	mtn.XXX; update attr function docs; add java class files to
+	standard ignore hook
+
 2006-06-08  Matt Johnston  <address@hidden>
 
-    * inodeprint.cc: convert to basic_io format. 
-    Silently skips reading old format files, then writes
-    out the new format as per usual. Old mtn versions
-    have no format checking so will read the (nonsensical)
-    new format file without errors.
+	* inodeprint.cc: convert to basic_io format.  Silently skips
+	reading old format files, then writes out the new format as per
+	usual. Old mtn versions have no format checking so will read the
+	(nonsensical) new format file without errors.
 
 2006-06-08  Matt Johnston  <address@hidden>
 
============================================================
--- cmd_merging.cc	4322d0bff3147c7f9493ff3e5e0ba356bb97d4b3
+++ cmd_merging.cc	53f666567a77400a9e8bb65637801cdd0f20a60b
@@ -635,11 +635,15 @@
     N_("dump the roster associated with the given REVID"),
     OPT_NONE)
 {
-  if (args.size() != 1)
+  revision_id rid;
+  if (args.size() == 0)
+    get_revision_id(rid);
+  else if (args.size() == 1)
+    complete(app, idx(args, 0)(), rid);
+  else
     throw usage(name);
 
-  revision_id rid;
-  complete(app, idx(args, 0)(), rid);
+  I(!null_id(rid));
 
   roster_t roster;
   marking_map mm;
============================================================
--- std_hooks.lua	d58c9f82407bd774bca64fcdae804f8881c80ff1
+++ std_hooks.lua	4865ef1cffe53cd529104488cd7adac8eaa30563
@@ -8,7 +8,7 @@
    if tdir == nil then tdir = os.getenv("TMP") end
    if tdir == nil then tdir = os.getenv("TEMP") end
    if tdir == nil then tdir = "/tmp" end
-   return mkstemp(string.format("%s/mt.XXXXXX", tdir))
+   return mkstemp(string.format("%s/mtn.XXXXXX", tdir))
 end
 
 function execute(path, ...)   
@@ -39,9 +39,8 @@
 -- attributes are persistent metadata about files (such as execute
 -- bit, ACLs, various special flags) which we want to have set and
 -- re-set any time the files are modified. the attributes themselves
--- are stored in a file .mt-attrs, in the workspace (and
--- manifest). each (f,k,v) triple in an attribute file turns into a
--- call to attr_functions[k](f,v) in lua.
+-- are stored in the roster associated with the revision. each (f,k,v)
+-- attribute triple turns into a call to attr_functions[k](f,v) in lua.
 
 if (attr_init_functions == nil) then
    attr_init_functions = {}
@@ -118,6 +117,8 @@
       -- c/c++
       "%.a$", "%.so$", "%.o$", "%.la$", "%.lo$", "^core$",
       "/core$", "/core%.%d+$",
+      -- java
+      "%.class$",
       -- python
       "%.pyc$", "%.pyo$",
       -- TeX