comparison src/grapher.cpp @ 409:69fb864a3972

Fix same-branch check for uncommitted item on default branch
author Chris Cannam
date Mon, 06 Jun 2011 21:33:25 +0100
parents b1f0fa991c49
children 470829a21f98
comparison
equal deleted inserted replaced
408:005633eed862 409:69fb864a3972
452 conn->setParent(pitem); 452 conn->setParent(pitem);
453 conn->setChild(m_uncommitted); 453 conn->setChild(m_uncommitted);
454 conn->setZValue(-1); 454 conn->setZValue(-1);
455 m_scene->addItem(conn); 455 m_scene->addItem(conn);
456 if (pitem) { 456 if (pitem) {
457 if (pitem->getChangeset()->branch() == uncommittedBranch) { 457 if (pitem->getChangeset()->isOnBranch(uncommittedBranch)) {
458 haveParentOnBranch = true; 458 haveParentOnBranch = true;
459 } 459 }
460 } 460 }
461 } 461 }
462 462