# 
# 
# patch "mtn_cvs/Makefile.am"
#  from [062c20ebe57b1c78bb9354f7df3fe0daccbf9146]
#    to [8914ec0cf25b42da20d86954db5ca8f0b773ffde]
# 
# patch "mtn_cvs/mtn_cvs.cc"
#  from [64a9b51a3148ac1f78b531d2a406e98da59319b7]
#    to [4e888ba0151a42bc241e31b526ac7346144f69c4]
# 
# patch "mtn_cvs/testsuite.lua"
#  from [707c5c24250876f1d23d76f23d32a33cf740c1a8]
#    to [cdbaa00a809fdc39f96852bfdc767b8c50f1524b]
# 
============================================================
--- mtn_cvs/Makefile.am	062c20ebe57b1c78bb9354f7df3fe0daccbf9146
+++ mtn_cvs/Makefile.am	8914ec0cf25b42da20d86954db5ca8f0b773ffde
@@ -6,7 +6,7 @@ libmtn_a_SOURCES=../netxx_pipe.cc ../san
 	../transforms.cc ../vocab.cc ../paths.cc ../charset.cc \
 	../simplestring_xform.cc ../constants.cc ../xdelta.cc \
 	../commands.cc ../basic_io.cc botan/md5.cpp piece_table.cc \
-	../mtn-sanity.cc 
+	../mtn-sanity.cc ../package_revision.c
 
 bin_PROGRAMS = mtn_cvs
 
============================================================
--- mtn_cvs/mtn_cvs.cc	64a9b51a3148ac1f78b531d2a406e98da59319b7
+++ mtn_cvs/mtn_cvs.cc	4e888ba0151a42bc241e31b526ac7346144f69c4
@@ -141,9 +141,11 @@ CMD(takeover, N_("working copy"), N_("[C
   cvs_sync::takeover(myapp, module);
 }
 
+#include <package_revision.h>
+
 void
 get_full_version(std::string & out)
-{ out="mtn_cvs version 0.1";
+{ out="mtn_cvs version 0.1 ("+std::string(package_revision_constant)+")";
 }
 
 namespace po = boost::program_options;
@@ -419,6 +421,13 @@ cpp_main(int argc, char ** argv)
       { L(FL("revision %s") % option::revision.get(vm));
         app.revisions.push_back(revision_id(option::revision.get(vm)));
       }
+      
+      if (option::version.given(vm))
+      { std::string version;
+        get_full_version(version);
+        std::cout << version << '\n'; 
+        return 0;
+      }
 
       if (option::help.given(vm)) requested_help = true;
             
============================================================
--- mtn_cvs/testsuite.lua	707c5c24250876f1d23d76f23d32a33cf740c1a8
+++ mtn_cvs/testsuite.lua	cdbaa00a809fdc39f96852bfdc767b8c50f1524b
@@ -283,4 +283,4 @@ table.insert(tests, "push_loop")
 table.insert(tests, "pull_xmodule")
 table.insert(tests, "push_simple")
 table.insert(tests, "push_loop")
+table.insert(tests, "takeover_modified")
---table.insert(tests, "takeover_modified")