# 
# 
# patch "mtn_cvs/options_list.hh"
#  from [737e82bc931de828a003ff85dcc4eaf49ffaaa3a]
#    to [e075593e5933f7b87ab35eae1cf0e67c994cb1cc]
# 
# patch "mtn_cvs/tests/push_loop/__driver__.lua"
#  from [03866d3669758695b5de83fbd306d3bf0837386a]
#    to [fd32b17e88aad6db7bd95218c6d051f171ac08e4]
# 
============================================================
--- mtn_cvs/options_list.hh	737e82bc931de828a003ff85dcc4eaf49ffaaa3a
+++ mtn_cvs/options_list.hh	e075593e5933f7b87ab35eae1cf0e67c994cb1cc
@@ -1,20 +1,20 @@
 
-COPT(branch_name, "branch", string, N_("select branch cert for operation"));
-COPT(revision, "revision", string, N_("select revision id for operation"));
+COPT(branch_name, "branch,b", string, N_("select branch cert for operation"));
+COPT(revision, "revision,r", string, N_("select revision id for operation"));
 COPT(since, "since", string, N_("set history start for CVS pull"));
 COPT(full, "full", string, N_("ignore already pulled CVS revisions"));
 
 GOPT(debug, "debug", nil, N_("print debug log to stderr while running"));
-GOPT(help, "help", nil, N_("display help message"));
-GOPT(version, "version", nil, N_("print version number, then exit"));
+GOPT(help, "help,h", nil, N_("display help message"));
+GOPT(version, "version,V", nil, N_("print version number, then exit"));
 GOPT(mtn, "mtn", string, N_("monotone binary name"));
 GOPT(mtn_option, "mtn-option", string, N_("pass option to monotone"));
 // these options are passed transparently
-GOPT(db, "db", string, N_("passed: database location"));
+GOPT(db, "db,d", string, N_("passed: database location"));
 GOPT(rcfile, "rcfile", string, N_("passed: config file"));
 GOPT(nostd, "nostd", nil, N_("passed: do not read standard hooks"));
 GOPT(keydir, "keydir", string, N_("passed: key directory"));
-GOPT(key, "key", string, N_("passed: key"));
+GOPT(key, "key,k", string, N_("passed: key"));
 GOPT(norc, "norc", nil, N_("passed: norc"));
 GOPT(root, "root", string, N_("passed: root"));
 GOPT(confdir, "confdir", string, N_("passed: confdir"));
============================================================
--- mtn_cvs/tests/push_loop/__driver__.lua	03866d3669758695b5de83fbd306d3bf0837386a
+++ mtn_cvs/tests/push_loop/__driver__.lua	fd32b17e88aad6db7bd95218c6d051f171ac08e4
@@ -19,7 +19,7 @@ check(indir("test", mtn("ci", "-m", "a d
 check(indir("test", mtn("drop", "A")), 0, false, false)
 check(indir("test", mtn("ci", "-m", "a dropped")), 0, false, false)
 
-check(mtn("automate", "heads"), 0, false, false)
+check(mtn("automate", "heads"), 0, true, false)
 canonicalize("stdout")
 left = readfile("stdout")