# 
# patch "ChangeLog"
#  from [8c383458e97101aa95b120a076ace9dac041ded5]
#    to [501f140e9335c16d7459bfa98e179e902ec232a5]
# 
# patch "manifest.cc"
#  from [e42a9ec927beb106fe6c251005eb6901a552199e]
#    to [13650d15c6b7fde18fb7018c68ebbf2e82d2d125]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-04-22  Nathaniel Smith  <address@hidden>
+
+	* manifest.cc (build_restricted_manifest_map): Fixup after merge
+	-- use file_exists instead of fs::exists.
+
 2005-04-22  Derek Scherger  <address@hidden>
 
 	* manifest.{cc,hh} (build_restricted_manifest_map): keep and
--- manifest.cc
+++ manifest.cc
@@ -78,7 +78,7 @@
 
   for (path_set::const_iterator i = paths.begin(); i != paths.end(); ++i)
     {
-      bool exists = fs::exists(mkpath((*i)()));
+      bool exists = file_exists(*i);
       bool included = app.restriction_includes(*i);
 
       if (included && exists)