# 
# 
# patch "cset.cc"
#  from [7201a4eb30f678d4c9b78f540f85bcbbf3923b5c]
#    to [e02b9b802566e760f15cfe37adcb26c27446b451]
# 
# patch "paths.cc"
#  from [7c773970143528c704d12b661c6e86aaf4e070b2]
#    to [d3290e08f71dd807af63d32ffbefbe84c8e61757]
# 
# patch "paths.hh"
#  from [b89fdc422541e0754a3e6cf60c8dfd95eef52564]
#    to [f61b1b0f8a6fe9f4b6a55ff1a5513412856cb75c]
# 
============================================================
--- cset.cc	7201a4eb30f678d4c9b78f540f85bcbbf3923b5c
+++ cset.cc	e02b9b802566e760f15cfe37adcb26c27446b451
@@ -256,63 +256,48 @@
 print_cset(basic_io::printer & printer,
            cset const & cs)
 {
-  string prev;
   for (path_set::const_iterator i = cs.nodes_deleted.begin();
        i != cs.nodes_deleted.end(); ++i)
     {
       file_path p(*i);
-      I(prev.empty() || p.as_internal() > prev);
-      prev = p.as_internal();
       basic_io::stanza st;
       st.push_file_pair(syms::delete_node, file_path(*i));
       printer.print_stanza(st);
     }
 
-  prev.clear();
   for (map<split_path, split_path>::const_iterator i = cs.nodes_renamed.begin();
        i != cs.nodes_renamed.end(); ++i)
     {
       file_path p(i->first);
-      I(prev.empty() || p.as_internal() > prev);
-      prev = p.as_internal();
       basic_io::stanza st;
       st.push_file_pair(syms::rename_node, file_path(i->first));
       st.push_file_pair(syms::to, file_path(i->second));
       printer.print_stanza(st);
     }
 
-  prev.clear();
   for (path_set::const_iterator i = cs.dirs_added.begin();
        i != cs.dirs_added.end(); ++i)
     {
       file_path p(*i);
-      I(prev.empty() || p.as_internal() > prev);
-      prev = p.as_internal();
       basic_io::stanza st;
       st.push_file_pair(syms::add_dir, file_path(*i));
       printer.print_stanza(st);
     }
 
-  prev.clear();
   for (map<split_path, file_id>::const_iterator i = cs.files_added.begin();
        i != cs.files_added.end(); ++i)
     {
       file_path p(i->first);
-      I(prev.empty() || p.as_internal() > prev);
-      prev = p.as_internal();
       basic_io::stanza st;
       st.push_file_pair(syms::add_file, file_path(i->first));
       st.push_hex_pair(syms::content, i->second.inner()());
       printer.print_stanza(st);
     }
 
-  prev.clear();
   for (map<split_path, pair<file_id, file_id> >::const_iterator i = cs.deltas_applied.begin();
        i != cs.deltas_applied.end(); ++i)
     {
       file_path p(i->first);
-      I(prev.empty() || p.as_internal() > prev);
-      prev = p.as_internal();
       basic_io::stanza st;
       st.push_file_pair(syms::patch, file_path(i->first));
       st.push_hex_pair(syms::from, i->second.first.inner()());
@@ -320,29 +305,18 @@
       printer.print_stanza(st);
     }
 
-  pair<string, string> prev_pair;
   for (set<pair<split_path, attr_key> >::const_iterator i = cs.attrs_cleared.begin();
        i != cs.attrs_cleared.end(); ++i)
     {
-      pair<string, string> new_pair(file_path(i->first).as_internal(),
-                                    i->second());
-      I(new_pair > prev_pair);
-      prev_pair = new_pair;
       basic_io::stanza st;
       st.push_file_pair(syms::clear, file_path(i->first));
       st.push_str_pair(syms::attr, i->second());
       printer.print_stanza(st);
     }
 
-  prev_pair.first.clear(); 
-  prev_pair.second.clear();
   for (map<pair<split_path, attr_key>, attr_value>::const_iterator i = cs.attrs_set.begin();
        i != cs.attrs_set.end(); ++i)
     {
-      pair<string, string> new_pair(file_path(i->first.first).as_internal(),
-                                    i->first.second());
-      I(new_pair > prev_pair);
-      prev_pair = new_pair;
       basic_io::stanza st;
       st.push_file_pair(syms::set, file_path(i->first.first));
       st.push_str_pair(syms::attr, i->first.second());
============================================================
--- paths.cc	7c773970143528c704d12b661c6e86aaf4e070b2
+++ paths.cc	d3290e08f71dd807af63d32ffbefbe84c8e61757
@@ -17,11 +17,6 @@
 #include "interner.hh"
 #include "transforms.hh"
 
-bool operator<(split_path const & l, split_path const & r)
-{
-  return file_path(l).as_internal() < file_path(r).as_internal();
-}
-
 // some structure to ensure we aren't doing anything broken when resolving
 // filenames.  the idea is to make sure
 //   -- we don't depend on the existence of something before it has been set
============================================================
--- paths.hh	b89fdc422541e0754a3e6cf60c8dfd95eef52564
+++ paths.hh	f61b1b0f8a6fe9f4b6a55ff1a5513412856cb75c
@@ -107,8 +107,6 @@
 
 typedef std::vector<path_component> split_path;
 
-bool operator<(split_path const & l, split_path const & r);
-
 const path_component the_null_component;
 
 inline bool