# 
# 
# patch "ChangeLog"
#  from [d4d233a12637b1ea62e7733445ebd5e1ae55fd24]
#    to [7e0c5081502dab554bde23e1f85abee6e5b17455]
# 
# patch "cmd_list.cc"
#  from [aa095825907151ba4f39a9182aabdf306d561a6a]
#    to [79f91298e7627e90ecbccb65d5fc693f26af026c]
# 
============================================================
--- ChangeLog	d4d233a12637b1ea62e7733445ebd5e1ae55fd24
+++ ChangeLog	7e0c5081502dab554bde23e1f85abee6e5b17455
@@ -1,3 +1,6 @@
+2006-12-16  Matt Johnston  <address@hidden>
+	* cmd_list.cc: ls_known, ls_changed: sort path output.
+
 2006-12-15  Nathaniel Smith  <address@hidden>
 
 	* paths.cc: Add a few more normalization tests for things like
============================================================
--- cmd_list.cc	aa095825907151ba4f39a9182aabdf306d561a6a
+++ cmd_list.cc	79f91298e7627e90ecbccb65d5fc693f26af026c
@@ -351,6 +351,9 @@ ls_known(app_state & app, vector<utf8> c
                         app.opts.depth,
                         new_roster, app);
 
+  // to be printed sorted
+  vector<split_path> print_paths;
+
   node_map const & nodes = new_roster.all_nodes();
   for (node_map::const_iterator i = nodes.begin();
        i != nodes.end(); ++i)
@@ -362,9 +365,16 @@ ls_known(app_state & app, vector<utf8> c
         {
           split_path sp;
           new_roster.get_name(nid, sp);
-          cout << file_path(sp) << "\n";
+          print_paths.push_back(sp);
         }
     }
+    
+  sort(print_paths.begin(), print_paths.end());
+  for (vector<split_path>::const_iterator sp = print_paths.begin();
+       sp != print_paths.end(); sp++)
+  {
+    cout << *sp << "\n";
+  }
 }
 
 static void
@@ -441,6 +451,9 @@ ls_changed(app_state & app, vector<utf8>
   set<node_id> nodes;
   select_nodes_modified_by_cset(included, old_roster, new_roster, nodes);
 
+  // to be printed sorted
+  vector<split_path> print_paths;
+
   for (set<node_id>::const_iterator i = nodes.begin(); i != nodes.end();
        ++i)
     {
@@ -449,9 +462,16 @@ ls_changed(app_state & app, vector<utf8>
         old_roster.get_name(*i, sp);
       else
         new_roster.get_name(*i, sp);
-      cout << sp << endl;
+      print_paths.push_back(sp);
     }
 
+    sort(print_paths.begin(), print_paths.end());
+    for (vector<split_path>::const_iterator sp = print_paths.begin();
+         sp != print_paths.end(); sp++)
+    {
+      cout << *sp << endl;
+    }
+
 }