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 Errors

Browse source 
- Fixed errors from merge mistakes.
This commit is contained in:
Paul Beckingham 2014-01-07 19:23:54 -05:00
parent 98f740e9d1
commit 9c41610f56
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Task.cpp
View file

@ -1880,7 +1880,7 @@ void Task::modify (
long l = (long) strtod (result.c_str (), NULL);
if (labs (l) < 5 * 365 * 86400)
{
Duration dur (value);
OldDuration dur (value);
Date now;
now += l;
(*this).set (name, now.toEpochString ());
@ -1892,7 +1892,7 @@ void Task::modify (
}
}
// Durations too.
// OldDurations too.
else if (name == "recur" ||
column->type () == "duration")
{
@ -1905,7 +1905,7 @@ void Task::modify (
std::string result = e.evalExpression ((*this));
context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");
Duration d (value);
OldDuration d (value);
// Deliberately storing the 'raw' value, which is necessary for
// durations like 'weekday'..