#
#
# patch "cmd_key_cert.cc"
#  from [a411628241629ecb7dcfbc490502701b62a63321]
#    to [74a076306fdbf8e347ad407c88247bb7f4334137]
# 
# patch "cmd_merging.cc"
#  from [a2062506e548919fa80e08aaf6e657cdcffb01e3]
#    to [f31e0f1627a45ba7eb5e16726c166a3b05c643dd]
# 
# patch "cmd_netsync.cc"
#  from [383033714e6aed01923de1d09ecd220dd45c13f5]
#    to [ae3ef08760d8272fd167c2a696fab8c56c3e54de]
# 
# patch "cmd_ws_commit.cc"
#  from [d9f7ec6e1af4c93860b588e90b3096accc9ec6d4]
#    to [2249e2046848eee83ebde95a179f724d5d82245b]
# 
# patch "maybe_workspace_updater.cc"
#  from [fadfa9fbc54902bffab84ea1b66a5caf190b1e2c]
#    to [476c3692b0ed2c99e1b2b90125adfb4125cce91d]
# 
# patch "options_list.hh"
#  from [773ff7d6bb1caa9ba5474ecfb21d267be0bddef9]
#    to [cd12247e0df2bd2f6ce90e1048933e884c805f3e]
#
============================================================
--- cmd_key_cert.cc	a411628241629ecb7dcfbc490502701b62a63321
+++ cmd_key_cert.cc	74a076306fdbf8e347ad407c88247bb7f4334137
@@ -310,7 +310,7 @@ CMD(approve, "approve", "", CMD_REF(revi
 CMD(approve, "approve", "", CMD_REF(review), N_("REVISION"),
     N_("Approves a particular revision"),
     "",
-    options::opts::branch | options::opts::maybe_auto_update)
+    options::opts::branch | options::opts::auto_update)
 {
   database db(app);
   key_store keys(app);
@@ -336,7 +336,7 @@ CMD(suspend, "suspend", "", CMD_REF(revi
 CMD(suspend, "suspend", "", CMD_REF(review), N_("REVISION"),
     N_("Suspends a particular revision"),
     "",
-    options::opts::branch | options::opts::maybe_auto_update)
+    options::opts::branch | options::opts::auto_update)
 {
   database db(app);
   key_store keys(app);
============================================================
--- cmd_merging.cc	a2062506e548919fa80e08aaf6e657cdcffb01e3
+++ cmd_merging.cc	f31e0f1627a45ba7eb5e16726c166a3b05c643dd
@@ -497,7 +497,7 @@ CMD(merge, "merge", "", CMD_REF(tree), "
     "",
     options::opts::branch | options::opts::date | options::opts::author |
     options::opts::messages | options::opts::resolve_conflicts_opts |
-    options::opts::maybe_auto_update)
+    options::opts::auto_update)
 {
   database db(app);
   key_store keys(app);
@@ -769,7 +769,7 @@ CMD(merge_into_dir, "merge_into_dir", ""
     N_("Merges one branch into a subdirectory in another branch"),
     "",
     options::opts::date | options::opts::author | options::opts::messages |
-    options::opts::resolve_conflicts_opts | options::opts::maybe_auto_update)
+    options::opts::resolve_conflicts_opts | options::opts::auto_update)
 {
   perform_merge_into_dir(app, execid, args);
 }
@@ -898,7 +898,7 @@ CMD(explicit_merge, "explicit_merge", ""
        "DEST-BRANCH."),
     options::opts::date | options::opts::author |
     options::opts::messages | options::opts::resolve_conflicts_opts |
-    options::opts::maybe_auto_update)
+    options::opts::auto_update)
 {
   database db(app);
   key_store keys(app);
============================================================
--- cmd_netsync.cc	383033714e6aed01923de1d09ecd220dd45c13f5
+++ cmd_netsync.cc	ae3ef08760d8272fd167c2a696fab8c56c3e54de
@@ -553,7 +553,7 @@ CMD(pull, "pull", "", CMD_REF(network),
        "from the netsync server at the address ADDRESS."),
     options::opts::max_netsync_version | options::opts::min_netsync_version |
     options::opts::set_default | options::opts::exclude |
-    options::opts::maybe_auto_update)
+    options::opts::auto_update)
 {
   database db(app);
   key_store keys(app);
@@ -600,7 +600,7 @@ CMD(sync, "sync", "", CMD_REF(network),
        "with the netsync server at the address ADDRESS."),
     options::opts::max_netsync_version | options::opts::min_netsync_version |
     options::opts::set_default | options::opts::exclude |
-    options::opts::key_to_push | options::opts::maybe_auto_update)
+    options::opts::key_to_push | options::opts::auto_update)
 {
   database db(app);
   key_store keys(app);
============================================================
--- cmd_ws_commit.cc	d9f7ec6e1af4c93860b588e90b3096accc9ec6d4
+++ cmd_ws_commit.cc	2249e2046848eee83ebde95a179f724d5d82245b
@@ -578,7 +578,7 @@ CMD(disapprove, "disapprove", "", CMD_RE
     N_("Disapproves a particular revision"),
     "",
     options::opts::branch | options::opts::messages | options::opts::date |
-    options::opts::author | options::opts::maybe_auto_update)
+    options::opts::author | options::opts::auto_update)
 {
   database db(app);
   key_store keys(app);
============================================================
--- maybe_workspace_updater.cc	fadfa9fbc54902bffab84ea1b66a5caf190b1e2c
+++ maybe_workspace_updater.cc	476c3692b0ed2c99e1b2b90125adfb4125cce91d
@@ -46,7 +46,7 @@ maybe_workspace_updater::maybe_workspace
 
 maybe_workspace_updater::maybe_workspace_updater(app_state & app,
                                                  project_t & project)
-  : can_do_update(app.opts.do_auto_update),
+  : can_do_update(app.opts.auto_update),
     app(app), project(project)
 {
   if (can_do_update)
============================================================
--- options_list.hh	773ff7d6bb1caa9ba5474ecfb21d267be0bddef9
+++ options_list.hh	cd12247e0df2bd2f6ce90e1048933e884c805f3e
@@ -135,23 +135,9 @@ OPT(automate_stdio_size, "automate-stdio
 }
 #endif
 
-OPTSET(maybe_auto_update)
-OPTVAR(maybe_auto_update, bool, do_auto_update, false)
-OPTION(maybe_auto_update, yes_update, false, "update",
-       gettext_noop("automatically update the workspace, if it is clean and the base "
-                    "revision is a head of an affected branch"))
-#ifdef option_bodies
-{
-  do_auto_update = true;
-}
-#endif
-OPTION(maybe_auto_update, no_update, false, "no-update",
-       gettext_noop("do not touch the workspace (default)"))
-#ifdef option_bodies
-{
-  do_auto_update = false;
-}
-#endif
+SIMPLE_OPTION(auto_update, "update/no-update", bool,
+              gettext_noop("automatically update the workspace, if it is clean and the base "
+                           "revision is a head of an affected branch"))
 
 OPTSET(bind_opts)
 OPTVAR(bind_opts, std::list<utf8>, bind_uris, )