GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '1.9.3' of tasktools.org:task into 1.9.3

Browse source
This commit is contained in:
Paul Beckingham 2010-08-06 19:00:40 -04:00
commit 3ac627978c
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); }

8
src/tests/merge.t
View file

@ -28,7 +28,7 @@
use strict;
use warnings;
use Test::More tests => 40;
use Test::More tests => 42;
use File::Copy;
use constant false => 0;
@ -132,14 +132,11 @@ sleep(1);
# make new remote modifications
qx{../task rc:remote.rc 4 +gym}; # right_newer
# invoke gc
qx{../task rc:local.rc};
qx{../task rc:remote.rc};
# merge remote into local
my $output_l = qx{../task rc:local.rc _merge remote/undo.data};
#check output
like ($output_l, qr/Running redo/, "local-merge finished");
unlike ($output_l, qr/Missing/, "local-merge: no missing entry");
unlike ($output_l, qr/Not adding duplicate/, "local-merge: no duplicates");
@ -147,6 +144,7 @@ unlike ($output_l, qr/Not adding duplicate/, "local-merge: no duplicates");
my $output_r = qx{../task rc:remote.rc _merge local/undo.data};
# check output
like ($output_r, qr/Running redo/, "remote-merge finished");
unlike ($output_r, qr/Missing/, "remote-merge: no missing entry");
unlike ($output_r, qr/Not adding duplicate/, "remote-merge: no duplicates");