From 87df2f66ec8cad3993f0c55edba0aeabd1c4f662 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 13 Sep 2011 00:51:58 -0400
Subject: [PATCH] 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 -
 src/TDB2.cpp              | 4 ++++
 src/commands/CmdMerge.cpp | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/PUNCHLIST b/PUNCHLIST
index c07c39239..5b2356b0d 100644
--- a/PUNCHLIST
+++ b/PUNCHLIST
@@ -1,5 +1,4 @@
 Beta1 Punch List
-- Working dependencies
 - DOM access
 - Working merge command
 - task.1 man page that is accurate
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 6bdbee161..6c7515588 100644
--- a/src/TDB2.cpp
+++ b/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 ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdMerge.cpp b/src/commands/CmdMerge.cpp
index 41b2d97aa..0447cff14 100644
--- a/src/commands/CmdMerge.cpp
+++ b/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);