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

[John Arbash Meinel]

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

Robert Collins wrote:
> On Thu, 2008-08-14 at 11:06 -0500, 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 don't like this much.

removed

> 
>> It also mutters the revision id into .bzr.log in case you forgot about
>> it and need to come back later.
> 
> I like this.

kept

...

> I'd be ok with printing 'use bzr pull . -r revid:XXXX to restore this
> uncommitted revision'.
> 
> -Rob
> 

done in attached

The new uncommit looks like:
$ bzr uncommit
    2 John Arbash Meinel        2008-05-23
      A more

The above revision(s) will be removed.
Are you sure [y/N]? y
You can restore the old tip by running:
  bzr pull . -r revid:john at arbash-meinel.com-20080524002737-z47pd2bf0py5qq6p


I put the '.' before the '-r' since it makes it obvious that it has to
be there (which was also your recommendation).

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

iEYEARECAAYFAkilzOAACgkQJdeBCYSNAAOypACgpYaOB+TaE+0fj6uHS3UBQREd
iQcAn0Z/64sEzxiZQNdt87PtGoPvhu92
=KZDQ
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: uncommit_ids2.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080815/41f74edd/attachment-0001.diff