History editing (Was: Will re-basing support be added into Bazaar core?)

Ian Clatworthy ian.clatworthy at internode.on.net
Mon Apr 20 12:58:44 BST 2009

David Timothy Strauss wrote:
> Ian makes a good point: "rebase" isn't even the best at cleaning up history. What might be more useful is a shelve-based approach of taking the final diff, dissecting it into coherent changes, and committing those.
> (1) Get a fresh branch.
> (2) Apply the net diff generated from the dirty-history feature branch.
> (3) Shelve all changes.
> (4) Work through unshelving the changes and committing them.
> (5) bzr send

Yes, I use shelve frequently in this way as well.

Ian C.

More information about the bazaar mailing list