# 
# 
# patch "mt_version.cc"
#  from [45d1e20bb6dc2d490854f8647d9788bc3ae04654]
#    to [884f28ca9691350cbbc3a5ebedcfc17a8e1244ec]
# 
# patch "visualc/monotone.vcproj"
#  from [801b1081b547851e95f43dd1c269407fbd5e7695]
#    to [1ce0a49637f7eafef58270a86a13b5bbb9e6c46f]
# 
============================================================
--- mt_version.cc	45d1e20bb6dc2d490854f8647d9788bc3ae04654
+++ mt_version.cc	884f28ca9691350cbbc3a5ebedcfc17a8e1244ec
@@ -21,11 +21,13 @@
 #include "package_full_revision.h"
 #include "sanity.hh"
 
+using std::string;
+
 void
 get_version(std::string & out)
 {
   out = (F("%s (base revision: %s)")
-         % PACKAGE_STRING % package_revision_constant).str();
+         % PACKAGE_STRING % string(package_revision_constant)).str();
 }
 
 void
@@ -54,7 +56,7 @@
     % BOOST_COMPILER
     % BOOST_STDLIB
     % BOOST_LIB_VERSION
-    % package_full_revision_constant;
+    % string(package_full_revision_constant);
   out = oss.str();
 }
 
============================================================
--- visualc/monotone.vcproj	801b1081b547851e95f43dd1c269407fbd5e7695
+++ visualc/monotone.vcproj	1ce0a49637f7eafef58270a86a13b5bbb9e6c46f
@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib"
 				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib popt.lib iconv.lib charset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
-				OutputFile="$(outdir)\$(ProjectName).exe"
+				OutputFile="$(outdir)\mtn.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""$(ProjectDir)\..\..\libiconv-1.9.1\lib";"$(ProjectDir)\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release";"C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Lib";"$(ProjectDir)\..";"$(ProjectDir)\Debug";C:\Boost\lib"
 				GenerateDebugInformation="true"
@@ -159,7 +159,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT.lib"
 				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib popt.lib iconv.lib charset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
-				OutputFile="$(outdir)/monotone.exe"
+				OutputFile="$(outdir)/mtn.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""$(ProjectDir)\..\..\libiconv-1.9.1\libcharset\lib";"$(ProjectDir)\..\..\libiconv-1.9.1\lib";"$(ProjectDir)\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release";"C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Lib";"$(ProjectDir)\..";"$(ProjectDir)\Release";C:\Boost\lib"
 				GenerateDebugInformation="true"
@@ -276,10 +276,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\inodeprint.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\win32\inodeprint.cc"
 				>
 				<FileConfiguration
@@ -302,6 +298,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\inodeprint.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\key_store.cc"
 				>
 			</File>