Getting rid of extra heads after repository conversion
Thomas Klausner
tk at giga.or.at
Sat May 19 06:34:53 UTC 2007
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
More information about the Mercurial
mailing list