bringing a changeset from one named branch into another

[Johannes Zillmann]

Hi folks,

have some trouble with merging. maybe someone could give me some hints.
i created a named branch 1.0 , so now i have 2 named branches:
(1) default
(2) 1.0

After branching i made one change in the 1.0 branch ( to reflect the 
version change)
After ongoing development in default, i want to to get one specific 
changeset into the 1.0 branch too.

What is the best way to do this ?
I've tried something like:
(a) hg export ec151dbbe381 > ec151dbbe381.patch and then it in 1.0
but after i could not push (has to merge first, i guess the missing 
changeset previous to ec151dbbe381).

(b) hg diff ec151dbbe381 or hg diff ec151dbbe381:57855cfe79f but that 
gave me not that single diff i see f.e. in the filebrowser for changeset 
ec151dbbe381.

Any ideas ?

Johannes



-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
101tec GmbH

Halle (Saale), Saxony-Anhalt, Germany
http://www.101tec.com