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

Bug - merge command resulted in an error if

Browse source 
completed/deleted tasks were overwritten with pending tasks
This commit is contained in:
Johannes Schlatow 2010-07-04 01:19:44 +02:00
parent 6428b026ba
commit 5ecbd85020
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/TDB.cpp
View file

@ -991,6 +991,10 @@ void TDB::undo ()
////////////////////////////////////////////////////////////////////////////////
void TDB::merge (const std::string& mergeFile)
{
///////////////////////////////////////
// Copyright 2010, Johannes Schlatow.
///////////////////////////////////////
// list of modifications that we want to add to the local database
std::list<Taskmod> mods;
@ -1224,7 +1228,7 @@ void TDB::merge (const std::string& mergeFile)
DEBUG_STR(" concat the first match to left branch");
// concat the oldest (but still newer) modification on the right
// to the endpoint on the left
mods.front().setBefore(tmod_l.getBefore());
mods.front().setBefore(tmod_l.getAfter());
}
}
} // for

2
src/Taskmod.cpp
View file

@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////////////////////
// task - a command line task list manager.
//
// Copyright 2006 - 2010, Paul Beckingham.
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
// All rights reserved.
//
// This program is free software; you can redistribute it and/or modify it under

2
src/Taskmod.h
View file

@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////////////////////
// task - a command line task list manager.
//
// Copyright 2006 - 2010, Paul Beckingham.
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
// All rights reserved.
//
// This program is free software; you can redistribute it and/or modify it under