how to get bazaar log rid of minor "sandbox" commits?
Neil Martinsen-Burrell
nmb at wartburg.edu
Wed Mar 11 21:14:39 GMT 2009
Rahul Nabar <rpnabar <at> gmail.com> writes:
> I am using bazaar to version assorted scattered config files and shell
> scripts etc. on my linux box and I am wondering if there is any
> workaround for my situation:
>
> Frequently my workflow is like this:
>
> bzr add fooscript
> bzr commit fooscript
> [fooscript works for months; no commits]
>
> Then I have an itch to add a new feature to fooscript.
> Change fooscript; make minor change; kind of works but not fully.
> Commit just in case.
> Change fooscript; make another minor change; kind of works but not
> fully. Commit just in case.
> Bad coding. Revert to previous. etc.
> [rinse; repeat ad nauseum]
>
> But finally after a day or two this script starts working.
> bzr commit
>
> Now I don't really want all those intermediate sandbox commits to
> litter my versioning history. I'd prefer to retain only the major
> commits that correspond to important feature additions etc. How can i
> achieve this behavior? I know it is more of a workflow thing than a
> core bazaar issue but just curious.
Rewriting history to show only certain changes is "rebasing". You want the
bzr-rebase plugin: https://launchpad.net/bzr-rebase. I'm not an expert on its
use as I don't use it myself (who do I have to hide from?). Another option
would be to make the changes on a branch, then when you merge them to the
mainline, you can look at a log without those merged revisions using ``bzr log
-n1`` or ``bzr log --short``.
-Neil
More information about the bazaar
mailing list