- 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

@ -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);