FW: dummy merge (two branches) for dummies

[Kastner Masilko, Friedrich]

> From: Mercurial [mailto:mercurial-bounces at mercurial-scm.org] On Behalf Of Uwe Brauer
>
> This drives me crazy.
> My repo has two branches.
> The output of log -G is for example
> (I had to abounded the merge maybe this is the reason why both seem to be active.
>
> @  changeset:   60:9f51f0a1bc8b
> |  branch:      foo
> |  tag:         tip
> |  parent:      53:c14490f0ccdf
> |  user:        Uwe Brauer <oub at mat.ucm.es>
> |  date:        Wed Aug 17 21:04:25 2016 +0000
> |  summary:     Foos changes from 17.8
> |
> | @  changeset:   59:c95d1d5985e7
> | |  branch:      uwe
> | |  user:        Uwe Brauer <oub at mat.ucm.es>
> | |  date:        Tue Aug 16 16:08:39 2016 +0000
> | |  summary:     Added tag vs-4 for changeset fa9ae2bfc4bc
> | |
> So I just want to merge *all* changes (of the tip) from the foo branch into the branch uwe.
>
> What is the easiest way to do that?

I often use this:

hg update foo
hg debugsetparents uwe foo
hg branch uwe
hg commit -m "Merge"



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.