#
#
# patch "cmd_list.cc"
#  from [481ca237fbebe2d50a820e47d98869ad0e5d9e9f]
#    to [adf389537dc7381e3ddcb5a75d0377be5482d3ef]
# 
# patch "cmd_merging.cc"
#  from [76227d1249a0bf097b4d0aa63fbe04d92e3f2419]
#    to [9a1dacae8931c700a6f7acd0b71c50082f663117]
#
============================================================
--- cmd_list.cc	481ca237fbebe2d50a820e47d98869ad0e5d9e9f
+++ cmd_list.cc	adf389537dc7381e3ddcb5a75d0377be5482d3ef
@@ -56,7 +56,7 @@ CMD(certs, "certs", "", CMD_REF(list), "
 CMD(certs, "certs", "", CMD_REF(list), "ID",
     N_("Lists certificates attached to an identifier"),
     "",
-    options::opts::depth | options::opts::exclude)
+    options::opts::none)
 {
   if (args.size() != 1)
     throw usage(execid);
@@ -158,7 +158,7 @@ CMD(keys, "keys", "", CMD_REF(list), "[P
 CMD(keys, "keys", "", CMD_REF(list), "[PATTERN]",
     N_("Lists keys that match a pattern"),
     "",
-    options::opts::depth | options::opts::exclude)
+    options::opts::none)
 {
   database db(app);
   key_store keys(app);
@@ -274,7 +274,7 @@ CMD(branches, "branches", "", CMD_REF(li
 CMD(branches, "branches", "", CMD_REF(list), "[PATTERN]",
     N_("Lists branches in the database that match a pattern"),
     "",
-    options::opts::depth | options::opts::exclude)
+    options::opts::exclude)
 {
   globish inc("*");
   if (args.size() == 1)
@@ -297,7 +297,7 @@ CMD(epochs, "epochs", "", CMD_REF(list),
 CMD(epochs, "epochs", "", CMD_REF(list), "[BRANCH [...]]",
     N_("Lists the current epoch of branches that match a pattern"),
     "",
-    options::opts::depth | options::opts::exclude)
+    options::opts::none)
 {
   database db(app);
   map<branch_name, epoch_data> epochs;
@@ -328,7 +328,7 @@ CMD(tags, "tags", "", CMD_REF(list), "",
 CMD(tags, "tags", "", CMD_REF(list), "",
     N_("Lists all tags in the database"),
     "",
-    options::opts::depth | options::opts::exclude)
+    options::opts::none)
 {
   database db(app);
   set<tag_t> tags;
@@ -346,7 +346,7 @@ CMD(vars, "vars", "", CMD_REF(list), "[D
 CMD(vars, "vars", "", CMD_REF(list), "[DOMAIN]",
     N_("Lists variables in the whole database or a domain"),
     "",
-    options::opts::depth | options::opts::exclude)
+    options::opts::none)
 {
   bool filterp;
   var_domain filter;
@@ -412,7 +412,7 @@ CMD(known, "known", "", CMD_REF(list), "
           print_paths.push_back(p);
         }
     }
-    
+
   sort(print_paths.begin(), print_paths.end());
   copy(print_paths.begin(), print_paths.end(),
        ostream_iterator<file_path>(cout, "\n"));
============================================================
--- cmd_merging.cc	76227d1249a0bf097b4d0aa63fbe04d92e3f2419
+++ cmd_merging.cc	9a1dacae8931c700a6f7acd0b71c50082f663117
@@ -808,11 +808,11 @@ CMD(show_conflicts, "show_conflicts", ""
     N_("Shows what conflicts need resolution between two revisions"),
     N_("The conflicts are calculated based on the two revisions given in "
        "the REV parameters."),
-    options::opts::branch | options::opts::date | options::opts::author)
+    options::opts::none)
 {
   database db(app);
   project_t project(db);
-  
+
   if (args.size() != 2)
     throw usage(execid);
   revision_id l_id, r_id;