# 
# 
# patch "automate.cc"
#  from [010d249d825b03d8eb366718ebcfd6fad7d572a1]
#    to [caaca78cb685f16f377ea2f0b208781288a1865e]
# 
# patch "mtn_cvs/mtn_cvs.cc"
#  from [595d8cf19bc4500221abe7efde60522cf0c7b845]
#    to [8f777dcc5ced081ce52025cb18ca86f7457f295f]
# 
============================================================
--- automate.cc	010d249d825b03d8eb366718ebcfd6fad7d572a1
+++ automate.cc	caaca78cb685f16f377ea2f0b208781288a1865e
@@ -1839,7 +1839,7 @@ AUTOMATE(find_newest_sync, N_("DOMAIN [B
   else if (args.size() != 1)
     throw usage(name);
   set<revision_id> heads;
-  get_branch_heads(branch, app, heads);
+  app.get_project().get_branch_heads(branch, heads);
   revision_t rev;
   revision_id rid;
   std::string domain = idx(args,0)();
============================================================
--- mtn_cvs/mtn_cvs.cc	595d8cf19bc4500221abe7efde60522cf0c7b845
+++ mtn_cvs/mtn_cvs.cc	8f777dcc5ced081ce52025cb18ca86f7457f295f
@@ -82,16 +82,18 @@ 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) {}
+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*) {}
-database::database(system_path const&) 
-  : roster_cache(constants::db_roster_cache_sz,roster_writeback_manager(*this))
-  {}
+database::database(system_path const&) : roster_cache(constants::db_roster_cache_sz,roster_writeback_manager(*this)) {}
 database::~database() {}
+outdated_indicator_factory::outdated_indicator_factory() {}
+outdated_indicator_factory::~outdated_indicator_factory() {}
+outdated_indicator::outdated_indicator() {}
+project_t::project_t(app_state&a) : app(a) {}
 
 // missing: compression level (-z), cvs-branch (-r), since (-D)
 CMD(pull, N_("network"), N_("[CVS-REPOSITORY CVS-MODULE [CVS-BRANCH]]"),