Getting rid of extra heads after repository conversion

[Matt Mackall]

On Sat, May 19, 2007 at 08:34:53AM +0200, Thomas Klausner wrote:
> On Thu, May 17, 2007 at 05:32:22PM +0200, Christian Ebert wrote:
> > This is from a post by Matt:
> > (Message-ID: <20061021165252.GF6412 at waste.org>)
> > 
> > $ hg update -C main_branch
> > $ HGMERGE=true hg merge deadbranch
> > $ hg revert -a -r main_branch
> > $ hg ci -m 'discard deadbranch'
> 
> Thank you!
> 
> I improved slightly upon it:
> $ hg update -C main_branch
> $ yes k | HGMERGE=true hg merge deadbranch
> $ hg revert -a -r main_branch
> $ hg ci -m 'discard deadbranch'
> 
> The additional "yes k" keeps me from pressing k or d for every file.
>  Thomas

Or you can use hg's -y option.

-- 
Mathematics is the supreme nostalgia of our time.