dummy merge (two branches) for dummies

[Kastner Masilko, Friedrich]

> From: Simon King [mailto:simon at simonking.org.uk] 
>
> ...but these sorts of complexities are exactly why debugXX commands are not part of the public hg interface. I would suggest that Uwe uses Matt's original suggestion, which is clear and will always work, no matter whether you use branches, bookmarks or anonymous heads.

That's why I wrote that you should only use it if you know what you are doing. However, if you look at what actually happens on your disk, the debugsetparents way is much clearer, because actually nothing happens at all (besides branch name change). Especially on large code-bases with many files, this can be a win in contrast to the three time dirstate change going on in the standard approach. Perhaps it would make sense to think about promoting the feature into public interface (given some polishing, of course)? The standard way seems way too complex for such a simple use-case to me, after all. In addition, I think TortoiseHg used this mode for fast and easy dummy merging before.



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.