dummy merge (two branches) for dummies

[Kastner Masilko, Friedrich]

> From: Mercurial [mailto:mercurial-bounces at mercurial-scm.org] On Behalf Of Uwe Brauer
> 
>     > 2) hg update foo
>     >    hg debugsetparents uwe foo
>     >    hg branch uwe
> nitpicking that should be hg merge uwe ? :-D
>
>     >    hg commit -m "Merge using debugsetparents"

The nitpick is wrong. It really should be "hg branch uwe", because that's the only thing that should be changed in the dirstate after the initial update to foo: the branch name. Everything else should stay as it is. As I wrote before, my initial post was wrong in the order of arguments of debugsetparents. Since you are at "foo", that should also be the first argument in the parents list, otherwise Mercurial would get quite confused and produce what Mischa Becker pointed out.

So the proper chain is:
hg update foo
hg debugsetparents foo uwe
hg branch uwe
hg commit -m "Merge"

This will give you a merge commit that has the exact same content as the foo revision.


Development Engineering Software Suite
Festo Gesellschaft m.b.H.
Linzer Strasse 227
Austria - 1140 Wien

Firmenbuch Wien
FN 38435y
UID: ATU14650108

T +43(1)91075-198
F +43(1)91075-282
www.festo.at

Der Inhalt dieser E-Mail und moeglicher Anhaenge sind ausschliesslich fuer den bezeichneten Adressaten bestimmt.
Jede Form der Kenntnisnahme, Veroeffentlichung, Vervielfaeltigung oder Weitergabe des Inhalts dieser E-Mail und
moeglicher Anhaenge durch unberechtigte Dritte ist unzulaessig. Wir bitten Sie, sich mit dem Absender der E-Mail in
Verbindung zu setzen, falls Sie nicht der Adressat dieser E-Mail sind sowie das Material von Ihrem Computer zu loeschen.

This e-mail and any attachments are confidential and intended solely for the addressee. The perusal, publication, copying or
dissemination of the contents of this e-mail by unauthorised third parties is prohibited. If you are not the intended recipient of this
e-mail, please delete it and immediately notify the sender.