dummy merge (two branches) for dummies

[Kastner Masilko, Friedrich]

> From: Mercurial [mailto:mercurial-bounces at mercurial-scm.org] On Behalf Of Becker, Mischa J
> 
> 2) Debugsetparents
>     > hg manifest
>     foo.txt
>     test.txt
>     uwe1.txt
>     uwe2.txt
>     > type test.txt
>     line-which-is-in-both-files
>     foo-three
>     > type uwe1.txt
>     uwe-one
>     uwe-five
>     > type uwe2.txt
>     uwe-four
>     uwe-five

> In example 2, uwe changes to files also changed by foo are discarded but all other uwe changes are kept. (See contents of uwe1.txt.) 

Me culpa. The order of arguments is actually important to get the right result here. It should be "hg debugsetparents foo uwe", not the other way around.

But as Matt wrote: it is more mysterious and should only be used if you know what you are doing.



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.