# 
# 
# patch "ChangeLog"
#  from [63fe6897c2eeb502ec762f0c47df1d4d5ec4aa3c]
#    to [cc876a97d7cae458bbdd018655d7485e475af574]
# 
# patch "monotone.cc"
#  from [f975c3c25c7731b7eb727854d9ec4e5ae964fca4]
#    to [f4e2ff9591c12d439494daab38a74693715ab463]
# 
# patch "roster.cc"
#  from [0ce52ff8f27920c2ab72a6536600c7516ad9297e]
#    to [180dd65bc143813ef9ec7d70f060fbd95ba6f4b7]
# 
# patch "visualc/config.h"
#  from [30d0419fd3ae17ca61944014ba657e5439d4ea1e]
#    to [b779c1cbccc698b36f8c200b8a5be361623f08ee]
# 
============================================================
--- ChangeLog	63fe6897c2eeb502ec762f0c47df1d4d5ec4aa3c
+++ ChangeLog	cc876a97d7cae458bbdd018655d7485e475af574
@@ -1,3 +1,11 @@
+2006-06-24  Matthew Gregan  <address@hidden>
+
+	* visualc/config.h: Bump version number to 0.27.
+	* monotone.cc (cpp_main): Fix another 'monotone' vs 'mtn' in
+	command output.
+	* roster.cc (update_current_roster_from_filesystem): Use prog_name
+	here too.
+
 2006-06-24  Marcel van der Boom  <address@hidden>
 
 	* roster.cc (update_current_roster_from_filesystem): Change
============================================================
--- monotone.cc	f975c3c25c7731b7eb727854d9ec4e5ae964fca4
+++ monotone.cc	f4e2ff9591c12d439494daab38a74693715ab463
@@ -632,8 +632,8 @@
           for (set<int>::const_iterator i = used_local_options.begin();
                i != used_local_options.end(); ++i)
             N(command_options.find(*i) != command_options.end(),
-              F("monotone %s doesn't use the option %s")
-              % cmd % coption_string(*i));
+              F("%s %s doesn't use the option %s")
+              % prog_name % cmd % coption_string(*i));
 
           vector<utf8> args;
           while(poptPeekArg(ctx()))
============================================================
--- roster.cc	0ce52ff8f27920c2ab72a6536600c7516ad9297e
+++ roster.cc	180dd65bc143813ef9ec7d70f060fbd95ba6f4b7
@@ -2230,9 +2230,10 @@
       "to restore consistency, on each missing file run either\n"
       "'%s drop FILE' to remove it permanently, or\n"
       "'%s revert FILE' to restore it\n"
-      "or to handle all at once, simply 'myn drop --missing'\n"
-      "or 'mtn revert --missing'")
-    % missing_files % app.prog_name % app.prog_name % app.prog_name);
+      "or to handle all at once, simply '%s drop --missing'\n"
+      "or '%s revert --missing'")
+    % missing_files % app.prog_name % app.prog_name % app.prog_name
+    % app.prog_name % app.prog_name);
 }
 
 void
============================================================
--- visualc/config.h	30d0419fd3ae17ca61944014ba657e5439d4ea1e
+++ visualc/config.h	b779c1cbccc698b36f8c200b8a5be361623f08ee
@@ -1,11 +1,11 @@
 #ifndef CONFIG_H
 #define CONFIG_H 1
 
 #define PACKAGE "monotone"
-#define PACKAGE_STRING "monotone 0.26"
+#define PACKAGE_STRING "monotone 0.27"
 #define PACKAGE_BUGREPORT "address@hidden"
 #define LC_MESSAGES LC_CTYPE
-#define VERSION "0.26"
+#define VERSION "0.27"
 
 #ifdef _MSC_VER
 typedef unsigned long pid_t;