GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-29 17:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge command

Browse source 
- Added call of gc() before executing the merge algorithm
- Removed workaround in unit test merge.t
This commit is contained in:
Johannes Schlatow 2010-08-06 14:58:38 +02:00
parent aa891401e4
commit f6cfa1dfa5
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Context.cpp
View file

@ -241,7 +241,8 @@ int Context::dispatch (std::string &out)
else if (cmd.command == "shell") { handleShell ( ); }
#endif
else if (cmd.command == "undo") { handleUndo ( ); }
else if (cmd.command == "_merge") { handleMerge (out); }
else if (cmd.command == "_merge") { tdb.gc ();
handleMerge (out); }
else if (cmd.command == "_projects") { rc = handleCompletionProjects (out); }
else if (cmd.command == "_tags") { rc = handleCompletionTags (out); }
else if (cmd.command == "_commands") { rc = handleCompletionCommands (out); }