[Bulk] Re: Are squashed commits and discarded branches possible in bzr?

[Gordon Tyler]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 5/10/2010 3:08 PM, Todd A. Jacobs wrote:
> Really, the desired end result is to discard the incremental (and often
> irrelevant) steps in building a feature up in a topic branch, so that
> the history in the trunk only reflects significant changes to features.

With bzr merge, you have to commit the merge into the target branch,
providing a commit message. This in a sense is a "squashed" commit since
under normal circumstances you will see only that commit in the mainline
history of the target branch. The individual revisions from the merge
source are only visible when specific options are given to bzr log or if
you use a GUI like bzr qlog and expand the + button next to the merge
commit.

Ciao,
Gordon
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJL6J7vAAoJEIrPJfWinA2uxUUH/1xERyS/m9Sd1kNVyhrbj7cC
5CsODBdL813nUCm/eH25Piff47eDs9H2JwaETlGQEqw4zRMkmJRnxCIhlZpkauqX
u1w54Ek2mvSgTWIbiaBA94uezRelTqvy8jopUmrx4r1AmG+8+xZDpLyYnk8j0xx0
F5XirXUDTREVLJVAzEi/fvJT3KWYvODSV6Ex3/JDyjyI1XtNcHSEBIyIWkEIWUq1
NV8krCcEaKWKIDjewlpHiT2xTviC6PMiEcSViaYgGxORSuvc3xXOBr3oJQCD82Xd
h1DCClXjuFpM4D/2z21JdSLS28aUZ1eeHaqzSYfKJjt1El6dXFNzW0R4gBjsJWY=
=DbwX
-----END PGP SIGNATURE-----