#
#
# patch "app_state.cc"
#  from [ecc7ff55c4dbe286fe568bda51ca826b8d31e3ac]
#    to [7dce08a3255c99adc96350424dce00ce403a2252]
# 
# patch "file_io.cc"
#  from [1edaa600f491b3cddb7628be8f0ab5d218971815]
#    to [7d820ae705fbd4dffe8e0b5e5b67e3f4367560fa]
# 
# patch "lua_hooks.cc"
#  from [dd57cb6c310e34d4e97ad90e7fd3a5353c8573a3]
#    to [757749282b8c1f336a466c55e7c0d9d7a874aa41]
# 
# patch "monotone.cc"
#  from [88dddf4a0869ee9436ab4cbeedb5d0fc25ce9f3f]
#    to [fb3a6056cecbb09cb65bdb9b410700d06b51e62a]
# 
# patch "paths.cc"
#  from [cc205cf3115b3b4e34397058666b1e17e949ca0c]
#    to [25f4a2179cd30659a62cb5f467dba2214fbdef30]
# 
# patch "paths.hh"
#  from [5f2909f8cb250e4a5ddbb66eae949517c644d91f]
#    to [3c506fff82779d8a58807bcbd364c459e6061886]
#
============================================================
--- app_state.cc	ecc7ff55c4dbe286fe568bda51ca826b8d31e3ac
+++ app_state.cc	7dce08a3255c99adc96350424dce00ce403a2252
@@ -28,6 +28,8 @@
 #include "ui.hh"
 #include "work.hh"
 
+namespace fs = boost::filesystem;
+
 using std::exception;
 using std::map;
 using std::string;
============================================================
--- file_io.cc	1edaa600f491b3cddb7628be8f0ab5d218971815
+++ file_io.cc	7d820ae705fbd4dffe8e0b5e5b67e3f4367560fa
@@ -23,6 +23,7 @@
 #include "platform-wrapped.hh"
 #include "numeric_vocab.hh"
 
+namespace fs = boost::filesystem;
 
 // Parts of boost::filesystem change in 1.34 . One particular
 // difference is that some exceptions are different now.
@@ -37,10 +38,6 @@
 # define FS_ERROR_SYSTEM system_error
 #endif
 
-
-
-
-
 // this file deals with talking to the filesystem, loading and
 // saving files.
 
============================================================
--- lua_hooks.cc	dd57cb6c310e34d4e97ad90e7fd3a5353c8573a3
+++ lua_hooks.cc	757749282b8c1f336a466c55e7c0d9d7a874aa41
@@ -38,6 +38,8 @@ extern char const test_hooks_constant[];
 extern char const test_hooks_constant[];
 #endif
 
+namespace fs = boost::filesystem;
+
 using std::make_pair;
 using std::map;
 using std::pair;
============================================================
--- monotone.cc	88dddf4a0869ee9436ab4cbeedb5d0fc25ce9f3f
+++ monotone.cc	fb3a6056cecbb09cb65bdb9b410700d06b51e62a
@@ -39,6 +39,8 @@
 #include "simplestring_xform.hh"
 #include "platform.hh"
 
+namespace fs = boost::filesystem;
+
 using std::cout;
 using std::cerr;
 using std::string;
============================================================
--- paths.cc	cc205cf3115b3b4e34397058666b1e17e949ca0c
+++ paths.cc	25f4a2179cd30659a62cb5f467dba2214fbdef30
@@ -11,9 +11,12 @@
 #include <sstream>
 
 #include <boost/version.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/convenience.hpp>
 
+namespace fs = boost::filesystem;
+
 #include "constants.hh"
 #include "paths.hh"
 #include "platform-wrapped.hh"
============================================================
--- paths.hh	5f2909f8cb250e4a5ddbb66eae949517c644d91f
+++ paths.hh	3c506fff82779d8a58807bcbd364c459e6061886
@@ -110,10 +110,6 @@
 
 #include "vocab.hh"
 
-#include <boost/filesystem/path.hpp>
-
-namespace fs = boost::filesystem;
-
 typedef std::vector<path_component> split_path;
 
 const path_component the_null_component;