# # # patch "src/view/panels/NodeInfo.cpp" # from [5e145bcc10a2ff58e862a557ea41fac99ef54742] # to [f4ef4b95b5077f82b1e0c07f23304a4edb244b73] # ============================================================ --- src/view/panels/NodeInfo.cpp 5e145bcc10a2ff58e862a557ea41fac99ef54742 +++ src/view/panels/NodeInfo.cpp f4ef4b95b5077f82b1e0c07f23304a4edb244b73 @@ -74,14 +74,21 @@ void NodeInfo::readAndSetInfo() inventoryItem->hasNotStatus(InventoryItem::Added) && !inventoryItem->isDirectory()) { + // if this is a renamed node, it can't be found under its new + // new name in the base revision of the workspace + QString path = inventoryItem->getPath(); + if (inventoryItem->hasStatus(InventoryItem::RenameTarget)) + { + path = inventoryItem->getRenameSource(); + } + DatabaseFile db = MonotoneUtil::getDatabaseFile(workspacePath); QStringList revs = MonotoneUtil::getPreviousContentMarks( - db, - inventoryItem->getPath(), - MonotoneUtil::getBaseWorkspaceRevision(workspacePath) + db, path, MonotoneUtil::getBaseWorkspaceRevision(workspacePath) ); + I(revs.size() > 0); - + // FIXME: for now we only handle the first returned content // mark; its not clear if merges would really pop up here if (revs.size() > 1) @@ -182,7 +189,7 @@ void NodeInfo::resetInfo() void NodeInfo::resetInfo() { inventoryItem = 0; - + lastChangeRevision->setText("-"); lastChangeAuthor->setText("-"); lastChangeDate->setText("-");