collapsing stuff

[James Westby]

On (04/01/08 22:13), Monty Taylor wrote:
> revision) is for code review. I can be working on something for a while,
> commit, build, test, etc. (say - I'm using bzr-builddeb and have to
> commit before every package build attempt) 

A note on bzr-builddeb that you may find useful, it never required the
workflow, and recent versions actually make it easier by allowing you to
build your changes before committing by default. I realise that is
incidental to the point of your mail though.

> But then I'm done and I want
> to show someone what I did and get them to ok it before I push. I don't
> want to ask them to look through 20 revisions, I want to show them the
> final patch, right?
> 
> It's not about _hiding_ work, per se. In fact, it would be stellar if
> all of the commit messages remained intact.

I would think that most cases would want some combination of the interim
commit messages and an overarching message about the whole bunch, so
ideally you would get an editor containing the individual messages and
the chance to edit.

> 
> The same thing could be achieved (minus saving the commit messages) with
> bzr uncommit and then a final bzr commit... but it would be a nice
> workflow possibly to have.
> 

Yes, uncommit -r and the commit does it ok for those that want it.
Another approach is git's rebase -i support, that allows you do squash
commits, and do other things like drop some completely and re-order the
rest. Interactive rebase would be great for solving a lot of problems
like this, but is quite a big hammer to swing at each individual
problem.

Thanks,

James

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256