[Python-Dev] Hg: inter-branch workflow

R. David Murray rdmurray at bitdance.com
Sun Mar 20 17:45:34 CET 2011


On Sun, 20 Mar 2011 16:39:50 -0000, Georg Brandl <g.brandl at gmx.net> 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.

And, as I discovered, only if they are on a single branch.  Which is
something *none* of the documentation I've read has mentioned.  Perhaps
that's because named branches are relatively new?

--
R. David Murray           http://www.bitdance.com


More information about the Python-Dev mailing list