# 
# 
# patch "ChangeLog"
#  from [d21d90c76d1c16df7add6801ddef2b368caa5472]
#    to [c33cb7057444ae2e8ae0249e8f22a435b1b82248]
# 
# patch "app_state.cc"
#  from [5625ed2fc4d93e413bb7b22d816c5147dae4d23a]
#    to [a941f16101beb709145100ba58cc9726c7dacbf2]
# 
# patch "app_state.hh"
#  from [c38d0225f794b7ad049cb7713b5a40eb79334749]
#    to [a6cba0558a4c377dda413b557c10781cd33668c1]
# 
# patch "options.hh"
#  from [7afcbe74224e8209cb754379d8e8e6b93cbe0ee8]
#    to [95d68d8fde1bc778d716e7ec3cffd6d2e924109f]
# 
============================================================
--- ChangeLog	d21d90c76d1c16df7add6801ddef2b368caa5472
+++ ChangeLog	c33cb7057444ae2e8ae0249e8f22a435b1b82248
@@ -6564,20 +6564,6 @@
 	* netsync.cc (process_error_cmd, run_netsync_protocol): Remove
 	some newlines to avoid translation noise.
 
-2005-08-13  Christof Petig <address@hidden>
-
-	use portable PipeStream implementation to reimplement changes on the
-	ssh branch
-
-2004-06-18  Christof Petig <address@hidden>
-
-	* netsync.cc:
-	(struct session): use PipeStream, pair of sockets
-	(find_wordend,parse_ssh_url): helper functions to parse an URL
-	(call_server): recognize ssh: and file: URLs
-	(serve_stdio): variant of serve_connections for stdio
-	(run_netsync_protocol): call serve_stdio if address is -
-
 2005-08-22  Nathaniel Smith  <address@hidden>
 
 	* po/LINGUAS, po/ja.po: Remove ja translation again, it seems to
============================================================
--- app_state.cc	5625ed2fc4d93e413bb7b22d816c5147dae4d23a
+++ app_state.cc	a941f16101beb709145100ba58cc9726c7dacbf2
@@ -172,22 +172,7 @@
   load_rcfiles();
 }
 
-
 void
-app_state::set_restriction(path_set const & valid_paths,
-                           vector<utf8> const & paths)
-{
-  path_set ps;
-  for (vector<utf8>::const_iterator i = paths.begin(); i != paths.end(); ++i)
-    {
-      file_path p = file_path_external(*i);
-      split_path sp;
-      p.split(sp);
-      ps.insert(sp);
-    }
-  set_restriction(valid_paths, ps);
-}
-
 app_state::set_database(system_path const & filename)
 {
   if (!filename.empty()) db.set_filename(filename);
============================================================
--- app_state.hh	c38d0225f794b7ad049cb7713b5a40eb79334749
+++ app_state.hh	a6cba0558a4c377dda413b557c10781cd33668c1
@@ -109,8 +109,6 @@
   void require_workspace(std::string const & explanation = "");
   void create_workspace(system_path const & dir);
 
-  void set_restriction(path_set const & valid_paths, 
-                       path_set const & paths);
   // Set the branch name. If you only invoke set_branch, the branch
   // name is not sticky (and won't be written to the workspace and
   // reused by subsequent monotone invocations).  Commands which
============================================================
--- options.hh	7afcbe74224e8209cb754379d8e8e6b93cbe0ee8
+++ options.hh	95d68d8fde1bc778d716e7ec3cffd6d2e924109f