# 
# patch "ChangeLog"
#  from [8508236ca23959954a0c0134b71043eedd74adf1]
#    to [e9de117a2044926f443013af7951cbe6069c62ae]
# 
# patch "app_state.cc"
#  from [b7cb05baff0ed3919b4d7449c629183acd68a25b]
#    to [7a6eec6df5336f398ef9a587f8ffd102b7beba2e]
# 
# patch "database.cc"
#  from [5e9924ead1dcc3b354cf9007ab5f92bcef8b148d]
#    to [3cd127283c020d9afadec7daae6e0a7358d1b977]
# 
# patch "file_io.cc"
#  from [2358b3a2e4ca8b85c46ebd0290102511b4798e13]
#    to [ea97ee017c1ce25bec7d6ca2fa7e3117da36de3b]
# 
# patch "file_io.hh"
#  from [305745304e709b57093043582937e0709de0981d]
#    to [7438900771d9c148c4c929639705e679409561fa]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-04-23  Derek Scherger  <address@hidden>
+
+	* app_state.cc:
+	* database.cc:
+	* file_io.{cc, hh}: fix bad merge
+
 2005-04-23  Nathaniel Smith  <address@hidden>
 
 	* database.cc (put_key): Check for existence of keys with
--- app_state.cc
+++ app_state.cc
@@ -286,18 +286,6 @@
 }
 
 void
-app_state::set_date(utf8 const & d)
-{
-  date = d;
-}
-
-void
-app_state::set_author(utf8 const & a)
-{
-  author = a;
-}
-
-void
 app_state::set_depth(long d)
 {
   N(d > 0,
--- database.cc
+++ database.cc
@@ -1495,7 +1495,7 @@
   L(F("Killing revision %s locally\n") % rid);
   execute("DELETE from revision_certs WHERE id = '%s'",rid.inner()().c_str());
   execute("DELETE from revision_ancestry WHERE child = '%s'",
-	  rid.inner()().c_str());
+          rid.inner()().c_str());
   execute("DELETE from revisions WHERE id = '%s'",rid.inner()().c_str());
 }
 
--- file_io.cc
+++ file_io.cc
@@ -163,38 +163,6 @@
 #endif
 }
 
-
-inline static fs::path 
-localized_impl(string const & utf)
-{
-  fs::path tmp = mkpath(utf), ret;
-  for (fs::path::iterator i = tmp.begin(); i != tmp.end(); ++i)
-    {
-      external ext;
-      utf8_to_system(utf8(*i), ext);
-      ret /= mkpath(ext());
-    }
-  return ret;
-}
-
-fs::path 
-localized(file_path const & fp)
-{
-  return localized_impl(fp());
-}
-
-fs::path 
-localized(local_path const & lp)
-{
-  return localized_impl(lp());
-}
-
-static fs::path
-localized(utf8 const & utf)
-{
-  return localized_impl(utf());
-}
-
 string 
 absolutify(string const & path)
 {
--- file_io.hh
+++ file_io.hh
@@ -45,8 +45,6 @@
 fs::path mkpath(std::string const & s);
 
 std::string get_homedir();
-fs::path localized(file_path const & fp);
-fs::path localized(local_path const & fp);
 std::string absolutify(std::string const & path);
 std::string tilde_expand(std::string const & path);