mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
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.
This commit is contained in:
parent
dcd0bd1de7
commit
87df2f66ec
3 changed files with 4 additions and 2 deletions
|
@ -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 ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue