hg pull --rebase

[k_bx]

Hi everyone!

I think I've just shot myself into a leg and here's how I did it.

Usually, instead of hg fetch I do hg pull --rebase since it doesn't create any "merge" commits. Also I felt secure about hg pull --rebase since it knows which changesets are local and rebases only the local ones (so I won't affect repository with moving already pushed changesets).

But here's what I did: I've started a branch::

    hg branch my-new-shiny-feature
    hg ci -m $'hg branch my-new-shiny-feature'
    echo "changes" > 1.txt
    hg ci -m $'my changes'

then (when finished) merged the branch to stable branch

    hg up stable
    hg merge my-new-shiny-feature

Reviewed, did some fixes. I was ready to push, and that's the moment when I did:

    hg pull --rebase

So it somehow tried to rebase everything into stable branch (even from my new feature branch) and had a conflicts (with what I've fixed after merge, I guess).

Ok, so what I want is hg pull --rebase to work with "current" branch only (I mean, it should rebase things only inside the same branch).

Thank you!