List of uncommits

[Chris McCormick]

Hi John,

On 05/08/2012 02:44 AM, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 5/7/2012 12:15 PM, Chris McCormick wrote:
>> On 05/07/2012 06:15 PM, Alexander Belchenko wrote:
>>> Chris McCormick пишет:
>>>> Through a series of deeply foolish command line invocations I
>>>> managed to uncommit on a bound branch and then pressed ^C just
>>>> after it had finished uncommitting on the remote bound
>>>> repository successfully. I then pulled the uncommit from the
>>>> remote which worked fine. Basically I now want to re-commit but
>>>> because I ^C'ed out I don't know the revision id that I should
>>>> recommit with. How can I find this out? Any way to list the
>>>> uncommitted revisions?
>>>
>>> bzr heads --dead
>>
>> Brilliant! Thank you so much.
>>
>> I think it would be appropriate if that was written on this page
>> somewhere:
>> http://doc.bazaar.canonical.com/beta/en/user-guide/undoing_mistakes.html
>>
>>   Cheers,
>>
>> Chris.
>>
>
> Note that when you do 'bzr uncommit' it prints out the revision id of
> the tip that you just moved from, and logs that revision into .bzr.log
> as well. That is the line:
>
> ...
>
> You can restore the old tip by running:
>    bzr pull . -r
> revid:john at arbash-meinel.com-20120507184047-ziouqtmq84smi7j6


Yes, that's normally the case, and the expected behaviour, however in 
this case what happened was I ctrl-C'ed the operation before it had 
finished uncommitting the local branch but after it had finished 
uncommitting the bound (remote) branch. Maybe this is a bug and I should 
report it? It means the two repositories were left out of sync and there 
was no message printed, despite the fact the operation had been 
successful on the remote branch. I am not sure what the fix would be 
though. Maybe to print something to this effect letting the user know 
that the operation has been completed on the remote (bound) branch but 
not the local one?

Another possible fix would be for me to not work when sleep deprived. :)

Cheers,

Chris.

-- 
http://mccormick.cx/