mirror of
https://github.com/weaveworks/scope.git
synced 2026-05-14 13:17:07 +00:00
fixup: one more Merge() where newest should be on the right
This commit is contained in:
@@ -180,7 +180,7 @@ func (ret *joinResults) mapChild(from, to string) {
|
||||
// Note it is not safe to mix calls to add() with addChild(), addChildAndChildren() or addUnmappedChild()
|
||||
func (ret *joinResults) add(from string, m report.Node) {
|
||||
if existing, ok := ret.nodes[m.ID]; ok {
|
||||
m = m.Merge(existing)
|
||||
m = existing.Merge(m)
|
||||
}
|
||||
ret.nodes[m.ID] = m
|
||||
ret.mapChild(from, m.ID)
|
||||
|
||||
Reference in New Issue
Block a user