[MERGE] 'bzr uncommit' shows revision ids in the log messages

John Arbash Meinel john at arbash-meinel.com
Thu Aug 14 17:28:58 BST 2008


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

Brian de Alwis wrote:
> On 14-Aug-2008, at 10:06 AM, John Arbash Meinel wrote:
>> This just changes "bzr uncommit" to set 'show_ids=True'. The premise is
>> that uncommit is one of those times where you may want to get back to
>> the revision_id you just got rid of.
> [...]
>> I ran into this because I wanted to pqm-submit a branch of mine in
>> stages, so I uncommit, submit, let pqm run. And then pull and submit
>> again.
> 
> 
> I had naively thought uncommit removed the commit entirely from the
> branch.  So uncommit only rolls back the tip, and leaves the commit
> information intact?
> 
> So there really is no way to expunge data without using rebase?
> 
> Brian.
> 

Rebase doesn't expunge it either. You need to garbage collect the
repository. That said, all of the fetching operations ignore
unreferenced information. So if you "bzr branch" or "bzr pull", etc.
from that branch, the uncommitted information will not be propagated.

So if you branch into a new repository, and then move that over the
original, it will remove those unreferenced bits.

At one point Jelmer had a plugin to do just this, only without actually
creating new branches. I always have difficulty finding it, because I
don't think he made a big deal about it.


There was also a point where uncommit had a way to actually nuke the
data from disk, but that was waaay back when we had 1-file per text
(<bzr 0.8).

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkikXUkACgkQJdeBCYSNAANYdACfXfcEhQMiCCdmabUk7FiUzlDR
83MAnReoHJqYurnAjXVi6tT3biiR0SQk
=sDzp
-----END PGP SIGNATURE-----



More information about the bazaar mailing list