Commands - merge

- Migrated handleMerge to CmdMerge.
2011-05-30 14:45:39 -04:00
parent af90a14cb5
commit 510ce650a6
9 changed files with 153 additions and 70 deletions
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -249,10 +249,7 @@ int Context::dispatch (std::string &out)
  Timer t ("Context::dispatch");

  // TODO Chain-of-command pattern dispatch.
-       if (cmd.command == "merge")            { tdb.gc ();
-                                                     handleMerge                 (out); }
-  else if (cmd.command == "" &&
-           sequence.size ())                  { rc = handleModify                (out); }
+  if (cmd.command == "" && sequence.size ()) { rc = handleModify (out); }

  // Commands that display IDs and therefore need TDB::gc first.
  // ...