>>> "Uwe" == Uwe Brauer <o...@mat.ucm.es> writes:
>>> "Uwe" == Uwe Brauer <o...@mat.ucm.es> writes:
> 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?
To answer my own question: I must run
hg shelve
And everything is fine.
_______________________________________________
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
