The Braves and D-backs agreed Thursday on a trade that will send outfielder Justin Upton to Atlanta as part of a seven-player swap.