synergy: upstream changes the source structure.
synergy: and should be a new revision.