#
# patch "ChangeLog"
#  from [c0799e46464b2534451e35c03bdfe29e572245fb]
#    to [bd86d0f80e3a521e572a03f8fc70e7f9519d4941]
#
# patch "automate.cc"
#  from [0c1886de21802dc65f8cd63d8aa7822f2307bc4d]
#    to [9eb7fae312c0ac8f8886cfc038e8df41df71d29b]
#
# patch "commands.cc"
#  from [b89c8dae93685fa6f913d0169001c735241ef308]
#    to [6fbcd8d6593838c0db2557c530c021d39b687986]
#
# patch "database.hh"
#  from [2d3eebe2d068fe59907c2a5c660a66d9eba93a77]
#    to [794783807386029f0a6d8067e2a7bb0eba88b0a2]
#
--- ChangeLog
+++ ChangeLog
@@ -3697,13 +3697,7 @@
 	* AUTHORS: Mention Wojciech and Neil.
 	* revision.cc (calculate_ancestors_from_graph): Make non-recursive.

-<<<<<<< variant A
-2005-01-17  Wojciech Mi‚kowski  <address@hidden>
->>>>>>> variant B
-2005-01-17  Wojciech Mi‚kowski  <address@hidden>
-####### Ancestor
-2005-01-17  Wojciech MiÃ…Â‚kowski  <address@hidden>
-======= end
+2005-01-17  Wojciech Miłkowski  <address@hidden>

 	* std_hooks.lua: Teach about meld.

--- automate.cc
+++ automate.cc
@@ -472,7 +472,6 @@
     automate_ancestry_difference(args, root_cmd_name, app, output);
   else if (cmd() == "leaves")
     automate_leaves(args, root_cmd_name, app, output);
-<<<<<<< variant A
   else if (cmd() == "parents")
     automate_parents(args, root_cmd_name, app, output);
   else if (cmd() == "children")
@@ -481,15 +480,6 @@
     automate_graph(args, root_cmd_name, app, output);
   else if (cmd() == "select")
     automate_select(args, root_cmd_name, app, output);
->>>>>>> variant B
-  else if (cmd() == "parents")
-    automate_parents(args, root_cmd_name, app, output);
-  else if (cmd() == "children")
-    automate_children(args, root_cmd_name, app, output);
-  else if (cmd() == "graph")
-    automate_graph(args, root_cmd_name, app, output);
-####### Ancestor
-======= end
   else
     throw usage(root_cmd_name);
 }
--- commands.cc
+++ commands.cc
@@ -2226,90 +2226,7 @@
     }

 }
->>>>>>> variant B
-static void
-print_inventory(std::string const & status,
-                std::string const & suffix,
-                path_set const & files,
-                path_set const & excluded)
-{
-  for (path_set::const_iterator i = files.begin(); i != files.end(); ++i)
-    {
-      if (excluded.find(*i) == excluded.end())
-        cout << status << " " << basic_io::escape((*i)() + suffix) << endl;
-    }
-}

-static void
-print_inventory(std::string const & status,
-                std::string const & suffix,
-                std::map<file_path, file_path> const & renames,
-                path_set const & excluded)
-
-{
-  for (std::map<file_path, file_path>::const_iterator i = renames.begin();
-       i != renames.end(); ++i)
-    {
-      if (excluded.find(i->second) == excluded.end())
-        cout << status
-             << " " << basic_io::escape(i->first() + suffix)
-             << " " << basic_io::escape(i->second() + suffix)
-             << endl;
-    }
-}
-
-CMD(inventory, "informative", "[PATH]...",
-    "inventory of every file in working copy with associated status",
-    % OPT_BRANCH_NAME % OPT_ALL_FILES)
-{
-  manifest_id old_manifest_id;
-  revision_id old_revision_id;
-  manifest_map m_old;
-  path_set old_paths, new_paths, empty;
-  change_set::path_rearrangement included, excluded;
-  path_set missing, changed, unchanged, unknown, ignored;
-
-  app.require_working_copy();
-
-  calculate_restricted_rearrangement(app, args,
-                                     old_manifest_id, old_revision_id,
-                                     m_old, old_paths, new_paths,
-                                     included, excluded);
-
-  file_itemizer u(app, new_paths, unknown, ignored);
-  walk_tree(u);
-
-  classify_paths(app, new_paths, m_old, missing, changed, unchanged);
-
-  print_inventory("!", "", missing, empty);
-
-  // a file may be missing and also added or the target of a rename. or it may
-  // be added or the target of a rename and also changed. inventory lists each
-  // file only once with the highest priority status. missing takes precedence
-  // over added or renamed. added or renamed takes precedence over changed.
-
-  print_inventory("-", "", included.deleted_files, empty);
-  print_inventory("-", "/", included.deleted_dirs, empty);
-
-  // ensure missing has precedence over renamed
-  print_inventory("%", "", included.renamed_files, missing);
-  print_inventory("%", "/", included.renamed_dirs, missing);
-
-  // ensure missing has precedence over added
-  print_inventory("+", "", included.added_files, missing);
-
-  print_inventory("#", "", changed, empty);
-
-  if (app.all_files)
-    {
-      print_inventory("=", "", unchanged, empty);
-      print_inventory("?", "", unknown, empty);
-      print_inventory("~", "", ignored, empty);
-    }
-}
-####### Ancestor
-======= end
-
 CMD(list, "informative",
     "certs ID\n"
     "keys [PATTERN]\n"
--- database.hh
+++ database.hh
@@ -290,8 +290,6 @@

   void delete_existing_rev_and_certs(revision_id const & rid);

-  void delete_existing_rev_and_certs(revision_id const & rid);
-
   // crypto key / cert operations

   void get_key_ids(std::string const & pattern,