[Python-Dev] Hg: inter-branch workflow

[Georg Brandl]

On 20.03.2011 16:39, Georg Brandl wrote:

> The reason why rebasing is not universally applied is that the
> rebased changesets are different from the original ones (therefore
> I wrote A' and B') -- even if the diff is the same, the parents
> are not, and therefore the changeset id (hash) changes.  This is
> called "changing history", and frowned upon by purists.  In reality
> it works fine if you know the limits: rebasing really only should be
> applied if the changesets are not already known somewhere else,
> only in the local repo you're working with.

Ah, and it apparently also doesn't work in more complex situations
where you already merged your changes to another branch.  This is where
David got stuck, I guess.

Georg