Merge

- Fixed merge, with an egregious hack for now, by creating zero-byte undo.data
  file.  This goes against the whole TDB2 philosophy, so it is temporary.
- Updated PUNCHLIST.
- Removed old tdb comment from CmdMerge.

PUNCHLIST

@@ -1,5 +1,4 @@
 Beta1 Punch List
-- Working dependencies
 - DOM access
 - Working merge command
 - task.1 man page that is accurate

src/TDB2.cpp

@@ -503,6 +503,10 @@ void TDB2::set_location (const std::string& location)
   undo.target      (location + "/undo.data");
   backlog.target   (location + "/backlog.data");
   synch_key.target (location + "/synch.key");
+
+  // TODO Awful miserable hack to make merge work with TDB2.
+  if (! undo._file.exists ())
+    undo._file.create ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/commands/CmdMerge.cpp

@@ -97,7 +97,6 @@ int CmdMerge::execute (std::string& output)
        || (bAutopush) )
     {
       // TODO derive autopush uri from merge.default.uri? otherwise: change prompt above
-//      context.task.set ("description", uri._data);
 
       std::string out;
       context.commands["push"]->execute (out);