- 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.
This commit is contained in:
Paul Beckingham 2011-09-13 00:51:58 -04:00
parent dcd0bd1de7
commit 87df2f66ec
3 changed files with 4 additions and 2 deletions

View file

@ -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 ();
}
////////////////////////////////////////////////////////////////////////////////