# 
# 
# patch "ChangeLog"
#  from [ecb41a60c0eb29dfea95e144a4dd89e86e1dc71e]
#    to [040d336864e2e362aa5215884ccfe07fa608f871]
# 
# patch "cmd_merging.cc"
#  from [b98e34e5f0f820fcadd105b56c91dd0ed7ffae66]
#    to [305e07dbe181bebb3de73f728dbf11a3e414b245]
# 
# patch "netxx/osutil.cxx"
#  from [78a1f1cc7884eb330bfda22b9102121216f969b7]
#    to [c66309a0ef2fb9088ee834459b8dde72fe0999a4]
# 
============================================================
--- ChangeLog	ecb41a60c0eb29dfea95e144a4dd89e86e1dc71e
+++ ChangeLog	040d336864e2e362aa5215884ccfe07fa608f871
@@ -1,3 +1,11 @@
+2006-05-25  Matthew Gregan  <address@hidden>
+
+	* cmd_merging.cc (CMD(update)): Report branch switch after
+	reporting updated files so that the user is less likely to miss
+	the message.
+
+	* netxx/osutil.cxx: Mark string table static const.
+
 2006-05-24  Matthew Gregan  <address@hidden>
 
 	* win32/get_system_flavour.cc: Report service pack number, if any
============================================================
--- cmd_merging.cc	b98e34e5f0f820fcadd105b56c91dd0ed7ffae66
+++ cmd_merging.cc	305e07dbe181bebb3de73f728dbf11a3e414b245
@@ -119,6 +119,7 @@
   
   P(F("selected update target %s\n") % r_chosen_id);
 
+  bool switched_branch = false;
   {
     // figure out which branches the target is in
     vector< revision<cert> > certs;
@@ -155,7 +156,8 @@
           {
             // one non-matching, inform and update
             app.branch_name = (*(branches.begin()))();
-            P(F("switching branches; next commit will use branch %s") % app.branch_name());
+	    switched_branch = true;
+	    P(F("switching to branch %s") % app.branch_name());
           }
         else
           {
@@ -262,6 +264,8 @@
     {
       app.make_branch_sticky();
     }
+  if (switched_branch)
+    P(F("switched branch; next commit will use branch %s") % app.branch_name());
   P(F("updated to base revision %s\n") % r_chosen_id);
 
   put_work_cset(remaining);
============================================================
--- netxx/osutil.cxx	78a1f1cc7884eb330bfda22b9102121216f969b7
+++ netxx/osutil.cxx	c66309a0ef2fb9088ee834459b8dde72fe0999a4
@@ -71,7 +71,7 @@
       struct {
           DWORD n;
           char const * m;
-      } error_msgs[]  = {
+      } static const error_msgs[]  = {
           { WSAEINTR, "interrupted function call" },
           { WSAEBADF, "invalid socket handle" },
           { WSAEACCES, "access denied" },