swap default branch

[Martin Geisler]

Greg Ward <greg-hg at gerg.ca> writes:

> Several months ago, someone posted a rough draft of an extension that
> supported branch aliasing, which would effectively do what you want.
> (I also tried to implement an extension like that myself a year ago,
> but it was much trickier than I expected. But it was also my first
> attempt at writing an extension, so I might have better luck now.)

I think you mean the branchident extension by Adrian Buehlmann:

  http://bitbucket.org/abuehl/hgext-branchident/wiki/Home

(You wont find it on our wiki anymore -- for some reason, he deleted the
wiki page for it today.)

> Probably the easiest thing to do is merge X to default. If you don't
> care about what's on default now and just want to clobber it with X,
> use the internal:other merge tool:
>
>   hg update default
>   HGMERGE=internal:other merge X

Small typo, it should be

  HGMERGE=internal:other hg merge X

or the equivalent using --config, which I think Windows users like
better:

  hg --config ui.merge=internal:other merge X

> If there were files added/removed on default since X was branched, you
> might need to explicitly revert them to the state on X:
>
>   hg revert -r X <files...>

Reverting all files seems the safest:

  hg revert --all -r X

> I suppose you could call that a reverse dummy merge: clobber local
> changes with whatever is on the other branch.

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100701/0cbc35a4/attachment.asc>