Mark Phippard talks about one of the new features in Subversion 1.5, merge tracking, which allow you to: "Record and use merge history to avoid the repeated merge problem and allow for cherry-picking."