#
#
# rename "migrate_worksp.cc"
#     to "migrate_work.cc"
# 
# patch "Makefile.am"
#  from [607163f9d88dec6858dfada0e5b0169fa5ec7bb4]
#    to [238136fce23461bffa01f285d8a33f4ad2801258]
# 
# patch "monotone.cc"
#  from [d1186612064cb061d088c85c7e50913d0c71e358]
#    to [7c8f94928f57378d86c2249d6b946f2144f571e6]
# 
# patch "sanity.cc"
#  from [1176978de39b1db2ae77993c2085fcd7230c7d28]
#    to [1da70ae1d4d0057201882a7f7f1b68b33f6303a1]
#
============================================================
--- Makefile.am	607163f9d88dec6858dfada0e5b0169fa5ec7bb4
+++ Makefile.am	238136fce23461bffa01f285d8a33f4ad2801258
@@ -33,7 +33,7 @@ MOST_SOURCES = 								\
 	lua_hooks.cc lua_hooks.hh 					\
 	transforms.cc transforms.hh					\
 	update.cc update.hh						\
-	work.cc migrate_worksp.cc work.hh				\
+	work.cc migrate_work.cc work.hh					\
 	cert.cc cert.hh							\
 	project.cc project.hh						\
 	outdated_indicator.cc outdated_indicator.hh			\
@@ -324,7 +324,7 @@ UNIT_TEST_OBJ_SUPPORT =							\
 	mtn-schema.$(OBJEXT) mtn-migrate_schema.$(OBJEXT)		\
 	mtn-specialized_lexical_cast.$(OBJEXT) mtn-ssh_agent.$(OBJEXT)	\
 	mtn-std_hooks.$(OBJEXT) mtn-ui.$(OBJEXT) mtn-work.$(OBJEXT)	\
-	mtn-migrate_worksp.$(OBJEXT)
+	mtn-migrate_work.$(OBJEXT)
 
 # primaries
 
============================================================
--- monotone.cc	d1186612064cb061d088c85c7e50913d0c71e358
+++ monotone.cc	7c8f94928f57378d86c2249d6b946f2144f571e6
@@ -161,8 +161,6 @@ cpp_main(int argc, char ** argv)
 int
 cpp_main(int argc, char ** argv)
 {
-  string real_prog_name;
-
   // go-go gadget i18n
   localize_monotone();
 
@@ -321,7 +319,7 @@ cpp_main(int argc, char ** argv)
   catch (option::option_error const & inf)
     {
       ui.inform(inf.what());
-      return 2;
+      return 1;
     }
   catch (recoverable_failure & inf)
     {
============================================================
--- sanity.cc	1176978de39b1db2ae77993c2085fcd7230c7d28
+++ sanity.cc	1da70ae1d4d0057201882a7f7f1b68b33f6303a1
@@ -130,7 +130,7 @@ sanity::initialize(int argc, char ** arg
     real_prog_name = real_prog_name.substr(0, prog_name.size() - 4);
   string::size_type last_slash = real_prog_name.find_last_of("/\\");
   if (last_slash != string::npos)
-    real_prog_name.erase(0, last_slash);
+    real_prog_name.erase(0, last_slash+1);
 }
 
 void