syncing to upstream

Tue Mar 4 08:46:37 CST 2008

I've been tracking http://selenic.com/repo/hg.

At 1 point I added a patch, and now I have 2 heads:
 hg heads
changeset:   6204:0068809347d7
tag:         tip
user:        Brendan Cully <brendan at kublai.com>
date:        Fri Feb 29 14:48:21 2008 -0800
summary:     highlight: forgot import

changeset:   6082:978b06a664ba
parent:      6030:52b9d1e54397
parent:      6081:fb259a3572e9
user:        ndbecker2 at gmail.com
date:        Tue Feb 12 20:14:50 2008 -0500
summary:     merge

What's the best way to forget the patch and just sync with upstream?