[Monotone-commits-diffs] net.venge.monotone.visualc: e0bebde63a53350843896982b0a4731366442f30

[code]

revision:            e0bebde63a53350843896982b0a4731366442f30
date:                2010-12-21T03:46:44
author:              Timothy Brownawell  <address@hidden>
branch:              net.venge.monotone.visualc
changelog:
merge of '19b63fdd368d5db44615adfdb13b454edd327443'
     and 'a4233aa70c114a8a4d5ac31aa28d61e3cdcdcc94'

manifest:
format_version "1"

new_manifest [395fbdf367a80826e5214cfdb6f8d42ca8303350]

old_revision [19b63fdd368d5db44615adfdb13b454edd327443]

patch "NEWS"
 from [33e31a93f80491aec6987e71afba913a8878eab2]
   to [7216d7870a01f5caaa0f309482d269d9345f3c38]

old_revision [a4233aa70c114a8a4d5ac31aa28d61e3cdcdcc94]

patch "monotone.cc"
 from [923cf3d2ed93ccc522bd841dd54f96d6915b42a8]
   to [971350d4749ede8945b6cd6d5f47b09d097fe759]
============================================================
--- NEWS	33e31a93f80491aec6987e71afba913a8878eab2
+++ NEWS	7216d7870a01f5caaa0f309482d269d9345f3c38
@@ -4,6 +4,9 @@ XXX XXX XX XX:XX:XX UTC 2010
 
         Changes
 
+        - The database scheme was changed; please execute 'mtn db migrate'
+          on all your local and remote databases.
+
         - in 'mtn conflicts resolve_first interactive', the result
           file name now defaults to _MTN/resolutions/<left_path>.
           (fixes monotone issue 103)
============================================================
--- monotone.cc	923cf3d2ed93ccc522bd841dd54f96d6915b42a8
+++ monotone.cc	971350d4749ede8945b6cd6d5f47b09d097fe759
@@ -170,11 +170,14 @@ cpp_main(int argc, char ** argv)
       // versions, including all of the stable branch 1.8.x.
       E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
         F("This monotone binary does not work with Botan 1.9.x."));
-#else
+#elif BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,9,0)
       E(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,22), origin::system,
         F("This monotone binary requires Botan 1.7.22 or newer."));
-      //E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
-      //  F("This monotone binary does not work with Botan 1.9.x."));
+      E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
+        F("This monotone binary does not work with Botan 1.9.x."));
+#else
+      E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
+        F("This monotone binaryrequires Botan 1.9.x."));
 #endif
 
       app_state app;