monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone.visualc: a4233aa70c114a8a4d5ac31aa28d61e3cdcdcc94
Date: Tue, 21 Dec 2010 02:39:43 GMT

revision:            a4233aa70c114a8a4d5ac31aa28d61e3cdcdcc94
date:                2010-12-21T02:39:31
author:              Timothy Brownawell  <address@hidden>
branch:              net.venge.monotone.visualc
changelog:
merge of 'b7d40492fa5aebe55c6df43a3aea16923a91867b'
     and 'd09be4c520a3220c74d677c64d072fe4f7aa4928'

manifest:
format_version "1"

new_manifest [45c19daf1202763d706ef8ed55b88e58ed643802]

old_revision [b7d40492fa5aebe55c6df43a3aea16923a91867b]

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

old_revision [d09be4c520a3220c74d677c64d072fe4f7aa4928]

patch "cmd_automate.cc"
 from [ee7440eecce8e55d903da8a8c9dcd511ea4ea889]
   to [f0e4da428ce6d14a1c111895c0ba0eb017edcb73]

patch "visualc/config.h"
 from [3e11c189cb25c5c8c2df4b882f9b12d86f49eb8a]
   to [7744d05089f81409101e88ee112dce9842a2c3b2]

patch "visualc/unistd.h"
 from [a38a6819a8feb51aa67e7e1d44265dd5193ec089]
   to [995f3916ee70e214f11c5e81f4b0b4b7676e9588]

patch "vocab.cc"
 from [8c5bb15cd5d94be236545517123419254dd60d99]
   to [94d0b4761bb5010ef27c008827486c52eb672a6a]
============================================================
--- 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)
============================================================
--- vocab.cc	8c5bb15cd5d94be236545517123419254dd60d99
+++ vocab.cc	94d0b4761bb5010ef27c008827486c52eb672a6a
@@ -190,7 +190,6 @@ template void dump(key_id const & r, str
 template void dump(file_id const & r, string &);
 template void dump(hexenc<id> const & r, string &);
 template void dump(key_id const & r, string &);
-//template void dump(rsa_pub_key const&, string &);
 template void dump(roster_data const & d, string &);
 template void dump(roster_delta const & d, string &);
 template void dump(manifest_data const & d, string &);
============================================================
--- visualc/config.h	3e11c189cb25c5c8c2df4b882f9b12d86f49eb8a
+++ visualc/config.h	7744d05089f81409101e88ee112dce9842a2c3b2
@@ -17,9 +17,6 @@ typedef unsigned int os_err_t;
 #define LOCALEDIR ""
 #endif
 
-/* Define if using bundled pcre */
-//#define PCRE_STATIC 1
-
 /* Type to use for `s16'. */
 #define TYPE_S16 short
 
============================================================
--- visualc/unistd.h	a38a6819a8feb51aa67e7e1d44265dd5193ec089
+++ visualc/unistd.h	995f3916ee70e214f11c5e81f4b0b4b7676e9588
@@ -10,7 +10,6 @@
 #ifdef _MSC_VER
 #include <io.h>
 #include <process.h>
-//typedef size_t ssize_t;
 #endif
 
 #endif /* _UNISTD_H */
============================================================
--- cmd_automate.cc	ee7440eecce8e55d903da8a8c9dcd511ea4ea889
+++ cmd_automate.cc	f0e4da428ce6d14a1c111895c0ba0eb017edcb73
@@ -12,7 +12,6 @@
 #include <iostream>
 #include <sstream>
 #include <map>
-//#include <unistd.h>
 
 #include "cmd.hh"
 #include "app_state.hh"

reply via email to

[Prev in Thread] Current Thread [Next in Thread]