#
#
# patch "mtn_cvs/cvs_sync.cc"
#  from [9a5d0aae019038504cb939ca41cef058c434fb62]
#    to [daab96d47def82a950541ddf9b43fe3dd86d3833]
# 
# patch "mtn_cvs/mtn_cvs.cc"
#  from [259efc8c8cccc1c3ff8aa532939e6a9be671b45d]
#    to [c4a5186678c030e840bf0397089c0b121e4da519]
#
============================================================
--- mtn_cvs/cvs_sync.cc	9a5d0aae019038504cb939ca41cef058c434fb62
+++ mtn_cvs/cvs_sync.cc	daab96d47def82a950541ddf9b43fe3dd86d3833
@@ -920,12 +920,12 @@ std::set<cvs_edge>::iterator cvs_reposit
   for (mtn_automate::edge_map::const_iterator j = rs.edges.begin(); 
        j != rs.edges.end();
        ++j)
-  { if ((parent==edges.end() && !is_empty(j->first)))
+  { if ((parent==edges.end() && !null_id(j->first)))
     { L(FL("%s != \"\"\n") % j->first);
       continue;
     }
     else if ((parent!=edges.end() && !(j->first == parent->revision)))
-    { L(FL("%s != %s\n") % j->first % (parentparent->revision));
+    { L(FL("%s != %s\n") % j->first % (parent->revision));
       continue;
     }
     boost::shared_ptr<mtn_automate::cset> cs=j->second;
============================================================
--- mtn_cvs/mtn_cvs.cc	259efc8c8cccc1c3ff8aa532939e6a9be671b45d
+++ mtn_cvs/mtn_cvs.cc	c4a5186678c030e840bf0397089c0b121e4da519
@@ -23,6 +23,7 @@
 #include <cmd.hh>
 #include "mtncvs_state.hh"
 #include <cvs_sync.hh>
+#include <constants.hh>
 
 // options are split into two categories.  the first covers global options,
 // which globally affect program behaviour.  the second covers options
@@ -82,12 +83,12 @@ struct ui_library
 };
 
 // fake app_state ctor/dtor, we do not use this class at all
-app_state::app_state() : db(system_path()), keys(this), work(db,lua), branch_is_sticky(), project(*this) {}
+app_state::app_state() : db(system_path()), keys(*this), work(db,lua), branch_is_sticky(), project(*this) {}
 void app_state::process_options() {}
 app_state::~app_state() {}
 lua_hooks::lua_hooks() {}
 lua_hooks::~lua_hooks() {}
-key_store::key_store(app_state*) {}
+key_store::key_store(app_state&a) : app(a) {}
 database::database(system_path const&) : roster_cache(constants::db_roster_cache_sz,roster_writeback_manager(*this)) {}
 database::~database() {}
 outdated_indicator_factory::outdated_indicator_factory() {}