patches, record almost (was: anti-dummy merge cherry pick from one commit of different branch)

[Uwe Brauer]

>>> "Uwe" == Uwe Brauer <oub at mat.ucm.es> writes:
   > The question is this: Could I force to pop up a merging tool (again say
   > meld) which just would show me all the changes of the collaborator's
   > branch, so that I could cherry pick what I like?



So the following does almost what I want

hg init
echo Main1 > main.txt
hg add main.txt
hg commit -m "Main1"
echo Main2 >> main.txt
hg commit -m "Main2"
echo Main3 >> main.txt
hg commit -m "Main3"
hg branch feature
echo Feature1 >> main.txt
hg commit -m "Feature1"
echo Feature2 >> main.txt
hg commit -m "Feature2"
hg up default
hg diff -r default -r feature > mypatch.patch
patch < mypatch.patch
hg record

Now hg asks me whether I want all changes, I chose the edit option, emacs
pops up, I delete the Feature2 line, check main.txt does not contain the
Feature2 line, then emacs ask for a commit message and oops Feature2
line is in again.

What do I miss?

Thanks

Uwe Brauer