#
#
# patch "cmd_merging.cc"
#  from [3f665ae0b10a9800925df54af0eb393c956d43a0]
#    to [b21c375b373335346034d880ef5dca15cf0a025c]
# 
# patch "tests/merge_into_workspace_attr_corpse/__driver__.lua"
#  from [7f01da1af5eedec9debf4f2d8f1dd7ec14561dcf]
#    to [b2e5f8748e7a645d97fc17ec4a071be0b1bf7df2]
#
============================================================
--- cmd_merging.cc	3f665ae0b10a9800925df54af0eb393c956d43a0
+++ cmd_merging.cc	b21c375b373335346034d880ef5dca15cf0a025c
@@ -1462,11 +1462,20 @@ CMD(heads, "heads", "", CMD_REF(tree), "
     cout << describe_revision(app.opts, app.lua, project, *i) << '\n';
 }
 
-CMD(get_roster, "get_roster", "", CMD_REF(debug), N_("[REVID]"),
-    N_("Dumps the roster associated with a given identifier"),
-    N_("If no REVID is given, the workspace is used."),
-    options::opts::none)
+// Name: get_roster
+// Arguments: none
+// Added in: 13.0
+// Purpose: Prints the internal roster for the given revision
+// Output format: basicio
+// Error conditions: if the revision does not exist, prints an error and exits
+CMD_AUTOMATE(get_roster, "[REVISION]",
+             N_("Prints the roster associated with a given identifier"),
+             N_("If no REVISION is given, the workspace is used."),
+             options::opts::none)
 {
+  E(args.size() < 2, origin::user,
+    F("wrong argument count"));
+
   database db(app);
   roster_t roster;
   marking_map mm;
@@ -1520,7 +1529,6 @@ CMD(get_roster, "get_roster", "", CMD_RE
     }
   else if (args.size() == 1)
     {
-      database db(app);
       project_t project(db);
       revision_id rid;
       complete(app.opts, app.lua, project, idx(args, 0)(), rid);
@@ -1528,14 +1536,13 @@ CMD(get_roster, "get_roster", "", CMD_RE
       db.get_roster(rid, roster, mm);
     }
   else
-    throw usage(execid);
+    I(false);
 
   roster_data dat;
   write_roster_and_marking(roster, mm, dat);
-  cout << dat;
+  output << dat;
 }
 
-
 // Local Variables:
 // mode: C++
 // fill-column: 76
============================================================
--- tests/merge_into_workspace_attr_corpse/__driver__.lua	7f01da1af5eedec9debf4f2d8f1dd7ec14561dcf
+++ tests/merge_into_workspace_attr_corpse/__driver__.lua	b2e5f8748e7a645d97fc17ec4a071be0b1bf7df2
@@ -42,7 +42,7 @@ check(get("expected-roster"))
 -- in-database merge would generate; in particular, both "left-attr"
 -- and "right-attr" should show up as "dormant_attr"s.
 check(get("expected-roster"))
-check(mtn("get_roster"), 0, true, nil)
+check(mtn("au", "get_roster"), 0, true, nil)
 canonicalize("stdout")
 check(samefile("expected-roster", "stdout"))