# 
# 
# patch "ChangeLog"
#  from [61b3a54ba053d520a2c18f1018e56c1a5e7f52ed]
#    to [89ba9080aa37b26f37230005213b815f993e7d4a]
# 
# patch "app_state.cc"
#  from [aa20d86b67b01165b66b8371b2ba99f166bad14a]
#    to [2af59d84eedf016fb3ad85d1c0e76667070d2fc6]
# 
# patch "paths.cc"
#  from [60c686171d7d90abe94bb2623ad2fc83831ae2e5]
#    to [cef87a9f72cc5011f93bb8bfa7d9ac6f6d0eeadd]
# 
# patch "paths.hh"
#  from [32e6d5e17fc88e25463b2891e0020092fa1bf1e2]
#    to [b97148599d5823bd41c4be253a363dbaf64e2411]
# 
# patch "win32/get_system_flavour.cc"
#  from [c544ce1a03e91fd3c18b3bc6b2a53c718544cd36]
#    to [190b43d9f01cd746ea3b74655df23420d8a877be]
# 
============================================================
--- ChangeLog	61b3a54ba053d520a2c18f1018e56c1a5e7f52ed
+++ ChangeLog	89ba9080aa37b26f37230005213b815f993e7d4a
@@ -1,28 +1,9 @@
-2006-05-22  Graydon Hoare  <address@hidden>
+2006-05-28  Graydon Hoare  <address@hidden>
 
-	* cmd_netsync.cc (serve): Make --no-transport-auth require --stdio.
+	* 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.
 
-2006-05-22  Graydon Hoare  <address@hidden>
-
-	* Makefile.am: Add uri.{cc,hh}.
-	* app_state.{cc,hh} (use_transport_auth): New state variable.
-	* cmd_netsync.cc (serve): Support use_transport_auth.
-	* constants.hh (netcmd_minsz): Remove dead byte count related to adler32.	
-	* hmac.{cc,hh} (active): New state variable.
-	* lua.{cc,hh} (lua_hooks::hook_get_netsync_connect_command):
-	(lua_hooks::hook_use_transport_auth): New hooks.
-	* monotone.cc: Support --no-transport-auth.
-	* monotone.texi: Document all this stuff.
-	* netcmd.cc: Predicate hmac activity on hmac.is_active().	
-	* netsync.cc: Parse URIs via lua, optionally disable transport auth.
-	* options.hh (OPT_NO_TRANSPORT_AUTH): New option.
-	* std_hooks.lua (get_netsync_connect_command):
-	(use_transport_auth): New default definitions.
-	* tests/t_netsync_pipe.at: New test.
-	* testsuite.at: Add new hooks and t_netsync_pipe.at.
-	* unit_tests.{cc,hh}: Support URI tests.
-	* uri.{cc,hh}: New files.
-
 2006-05-27  Derek Scherger  <address@hidden>
 
 	* annotate.cc:
@@ -93,7 +74,7 @@
 2006-05-27  Derek Scherger  <address@hidden>
 
 	* paths.cc (find_and_go_to_workspace): ensure that the current
-	directory is below the specified -root; issue a warning and abort
+	directory is below the specified --root; issue a warning and abort
 	the search if it's not
 	* tests/t_invalid_root.at: new test
 	* testsuite.at: call it
@@ -186,6 +167,31 @@
 
 	* po/sv.po: A fuzzy to change.
 
+2006-05-22  Graydon Hoare  <address@hidden>
+
+	* cmd_netsync.cc (serve): Make --no-transport-auth require --stdio.
+
+2006-05-22  Graydon Hoare  <address@hidden>
+
+	* Makefile.am: Add uri.{cc,hh}.
+	* app_state.{cc,hh} (use_transport_auth): New state variable.
+	* cmd_netsync.cc (serve): Support use_transport_auth.
+	* constants.hh (netcmd_minsz): Remove dead byte count related to adler32.	
+	* hmac.{cc,hh} (active): New state variable.
+	* lua.{cc,hh} (lua_hooks::hook_get_netsync_connect_command):
+	(lua_hooks::hook_use_transport_auth): New hooks.
+	* monotone.cc: Support --no-transport-auth.
+	* monotone.texi: Document all this stuff.
+	* netcmd.cc: Predicate hmac activity on hmac.is_active().	
+	* netsync.cc: Parse URIs via lua, optionally disable transport auth.
+	* options.hh (OPT_NO_TRANSPORT_AUTH): New option.
+	* std_hooks.lua (get_netsync_connect_command):
+	(use_transport_auth): New default definitions.
+	* tests/t_netsync_pipe.at: New test.
+	* testsuite.at: Add new hooks and t_netsync_pipe.at.
+	* unit_tests.{cc,hh}: Support URI tests.
+	* uri.{cc,hh}: New files.
+
 2006-05-22  Timothy Brownawell  <address@hidden>
 
 	* file_io.{cc,hh} localized_file_io.{cc,hh}: Split off the functions
============================================================
--- app_state.cc	aa20d86b67b01165b66b8371b2ba99f166bad14a
+++ app_state.cc	2af59d84eedf016fb3ad85d1c0e76667070d2fc6
@@ -37,7 +37,7 @@
   : branch_name(""), db(system_path()), keys(this), recursive(false),
     stdhooks(true), rcfiles(true), diffs(false),
     no_merges(false), set_default(false), verbose(false), date_set(false),
-    search_root("/"),
+    search_root(current_root_path()),
     depth(-1), last(-1), next(-1), diff_format(unified_diff), diff_args_provided(false),
     execute(false), bind_address(""), bind_port(""), 
     bind_stdio(false), use_transport_auth(true), missing(false), unknown(false),
============================================================
--- paths.cc	60c686171d7d90abe94bb2623ad2fc83831ae2e5
+++ paths.cc	cef87a9f72cc5011f93bb8bfa7d9ac6f6d0eeadd
@@ -579,6 +579,13 @@
 // workspace (and path root) handling
 ///////////////////////////////////////////////////////////////////////////
 
+system_path 
+current_root_path()
+{
+  return system_path(fs::initial_path().root_path().string());
+}
+
+
 bool
 find_and_go_to_workspace(system_path const & search_root)
 {
============================================================
--- paths.hh	32e6d5e17fc88e25463b2891e0020092fa1bf1e2
+++ paths.hh	b97148599d5823bd41c4be253a363dbaf64e2411
@@ -243,6 +243,9 @@
 void
 save_initial_path();
 
+system_path 
+current_root_path();
+
 // returns true if workspace found, in which case cwd has been changed
 // returns false if workspace not found
 bool
@@ -256,6 +259,7 @@
 typedef std::set<split_path> path_set;
 
 // equivalent to file_path_internal(path).split(sp) but more efficient.
-void internal_string_to_split_path(std::string const & path, split_path & sp);
+void 
+internal_string_to_split_path(std::string const & path, split_path & sp);
 
 #endif
============================================================
--- win32/get_system_flavour.cc	c544ce1a03e91fd3c18b3bc6b2a53c718544cd36
+++ win32/get_system_flavour.cc	190b43d9f01cd746ea3b74655df23420d8a877be
@@ -65,7 +65,7 @@
   { PROCESSOR_SHx_SH3DSP, "sh3dsp" },
 #endif
 #ifdef PROCESSOR_AMD_X8664
-  { PROCESSOR_AMD_X8684, "amd64" },
+  { PROCESSOR_AMD_X8664, "amd64" },
 #endif
   { 0, 0 }
 };