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

TD-64: sync conflict deleted all annotations of the task

Browse source 
- Thanks to Markus Beppler, Konstantin Vorobyev.
This commit is contained in:
Paul Beckingham 2016-02-28 11:09:00 -05:00
parent 677c2e87b5
commit 2980f5d3ce
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS
View file

@ -126,7 +126,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
Sunil Joshi Sunil Joshi
Misty De Meo Misty De Meo
Kent R. Spillner Kent R. Spillner
Konstantin Konstantin Vorobyev
Thanks to the following, who submitted detailed bug reports and excellent Thanks to the following, who submitted detailed bug reports and excellent
suggestions: suggestions:

2
ChangeLog
View file

@ -1,5 +1,7 @@
2.5.2 () - 2.5.2 () -
- TD-64 sync conflict deleted all annotations of the task
(thanks to Markus Beppler, Konstantin Vorobyev).
- Removed deprecated 'alias._query' setting. - Removed deprecated 'alias._query' setting.
2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0

6
src/Task.cpp
View file

@ -270,6 +270,9 @@ void Task::set (const std::string& name, const std::string& value)
{ {
data[name] = json::decode (value); data[name] = json::decode (value);
if (! name.compare (0, 11, "annotation_", 11))
++annotation_count;
recalc_urgency = true; recalc_urgency = true;
} }
@ -286,6 +289,9 @@ void Task::remove (const std::string& name)
{ {
if (data.erase (name)) if (data.erase (name))
recalc_urgency = true; recalc_urgency = true;
if (! name.compare (0, 11, "annotation_", 11))
--annotation_count;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////