# 
# 
# patch "ChangeLog"
#  from [3e698f8533b8e44bdb0453e5da271860cda2b493]
#    to [7cdfbc8320d4ce42906e722e22360e9a46cd6953]
# 
# patch "visualc/monotone.vcproj"
#  from [383ea893a09dda04c7779e285d92d9012d084116]
#    to [9d46921fd44aaade50e10bc7708a2d1f31205ea6]
# 
============================================================
--- ChangeLog	3e698f8533b8e44bdb0453e5da271860cda2b493
+++ ChangeLog	7cdfbc8320d4ce42906e722e22360e9a46cd6953
@@ -1,5 +1,10 @@
 2006-05-28  Graydon Hoare  <address@hidden>
 
+	* visualc/monotone.vcproj: Fix for package revision generation
+	(still not capturing workspace changes, but base rev)
+
+2006-05-28  Graydon Hoare  <address@hidden>
+
 	* app_state.cc (search_root): Initialize to current_root_path().
 	* paths.{cc,hh} (current_root_path): New function.
 	* win32/get_system_flavour.cc (processor_types): Fix typo.
============================================================
--- visualc/monotone.vcproj	383ea893a09dda04c7779e285d92d9012d084116
+++ visualc/monotone.vcproj	9d46921fd44aaade50e10bc7708a2d1f31205ea6
@@ -324,6 +324,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\inodeprint.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\win32\inodeprint.cc"
 				>
 				<FileConfiguration
@@ -346,10 +350,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\inodeprint.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\key_store.cc"
 				>
 			</File>
@@ -905,6 +905,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Generating $(ProjectDir)\..\schema.h from $(ProjectDir)\..\schema.sql"
 					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\schema.sql schema &gt;$(ProjectDir)\..\schema.h&#x0D;&#x0A;"
 					AdditionalDependencies="$(TargetDir)\txt2c.exe"
 					Outputs="schema.h"
@@ -929,6 +930,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Generating $(ProjectDir)\..\std_hooks.h from $(ProjectDir)\..\std_hooks.lua"
 					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\std_hooks.lua std_hooks &gt;$(ProjectDir)\..\std_hooks.h&#x0D;&#x0A;"
 					AdditionalDependencies="$(TargetDir)\txt2c.exe"
 					Outputs="std_hooks.h"
@@ -953,6 +955,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Generating $(ProjectDir)\..\test_hooks.h from $(ProjectDir)\..\test_hooks.lua"
 					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\test_hooks.lua test_hooks &gt;$(ProjectDir)\..\test_hooks.h&#x0D;&#x0A;"
 					AdditionalDependencies="$(TargetDir)\txt2c.exe"
 					Outputs="test_hooks.h"
@@ -977,7 +980,8 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="copy $(ProjectDir)\..\MT\revision $(ProjectDir)\..\package_revision.txt&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\unknown_package.txt package_full_revision &gt;$(ProjectDir)\..\package_full_revision.cc&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\..\package_revision.txt package_revision &gt;$(ProjectDir)\..\package_revision.cc&#x0D;&#x0A;"
+					Description="Writing package_full_revision.cc"
+					CommandLine="copy $(ProjectDir)\..\_MTN\revision $(ProjectDir)\..\package_revision.txt&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\unknown_package.txt package_full_revision &gt;$(ProjectDir)\..\package_full_revision.cc&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\..\package_revision.txt package_revision &gt;$(ProjectDir)\..\package_revision.cc&#x0D;&#x0A;"
 					AdditionalDependencies="$(TargetDir)\txt2c.exe"
 					Outputs="package_full_revision.cc;package_revision.cc"
 				/>
@@ -1001,7 +1005,8 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\views.sql views &gt;$(ProjectDir)\..\views.h&#x0D;&#x0A;"
+					Description="Generating $(ProjectDir)\..\views.h from $(ProjectDir)\..\views.sql"
+					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\views.sql views &gt;$(ProjectDir)\..\views.h"
 					AdditionalDependencies="$(TargetDir)\txt2c.exe"
 					Outputs="views.h"
 				/>