problems with the hg-git plugin and bookmarks

[Uwe Brauer]

   > [quoted text edited for length] The rebase is entirely optional.
   > The most basic workflow for submitting upstream changes is:



   > 1. Clone upstream repo.
   > 2. Write/edit code. Commit one or more times.

But in different branch/bookmark?

   > 3. Send patch using `hg email` or `hg export`. Note that you can
   > e-mail or export multiple commits as easily as a single commit.

But not rebeasing or merging my changes into master/default? If the
relevant maintainer can deal with such a solution that is fine for me. I
thought live is easier for him/her if I send the patch with respect to
the most recent pull.

   > No pulling, rebasing, or anything else necessary. Your history doesn't
   > need to be linear. Assuming your patch still applies cleanly for the
   > maintainer, there's no reason to pull upstream changes just to update
   > your patch.

   > If you want to _use_ a newer upstream version with your changes
   > applied, then you can use rebase (or graft, or export+import, or
   > whatever other tools you like). The way to do that with rebase is:

   > $ hg up exam
   > $ hg rebase -d master

   > If that says "nothing to rebase", then your changes are already
   > descended from the current master. (Note that I'm only using 'master'
   > because you've said you're interacting with an upstream Git repo; in
   > Mercurial bookmark terms we spell it '@').


And if not? That is if *there is* something to rebase, then  my branch is
linearized, no? (I don't like that outcome, I want to keep my stuff
in my branch). 

thanks

Uwe