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

Bug

Browse source 
* fixed bug in merge command where the first match of a uuid in
  pending.data was on the depends attribute
This commit is contained in:
Johannes Schlatow 2011-02-13 01:51:34 +01:00
parent 436c152fde
commit ea57b560d9
2 changed files with 142 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/TDB.cpp
View file

@ -1457,7 +1457,7 @@ void TDB::merge (const std::string& mergeFile)
// Find the same uuid in completed data
for (it = completed.begin (); it != completed.end (); ++it)
{
if (it->find (uuid) != std::string::npos)
if (it->find ("uuid:\"" + uuid) != std::string::npos)
{
// Update the completed record.
/*
@ -1500,7 +1500,7 @@ void TDB::merge (const std::string& mergeFile)
// Find the same uuid in the pending data.
for (it = pending.begin (); it != pending.end (); ++it)
{
if (it->find (uuid) != std::string::npos)
if (it->find ("uuid:\"" + uuid) != std::string::npos)
{
// Update the pending record.
std::cout << "Found remote change to "
@ -1555,7 +1555,7 @@ void TDB::merge (const std::string& mergeFile)
std::vector <std::string>::iterator pit;
for (pit = pending.begin (); pit != pending.end (); ++pit)
{
if (pit->find (uuid) != std::string::npos)
if (pit->find ("uuid:\"" + uuid) != std::string::npos)
{
found = true;
break;