the way to undo `bzr update` in bound branch (heavy checkout) with local commits?

Alexander Belchenko bialix at ukr.net
Mon Jan 11 17:05:41 GMT 2010


John Arbash Meinel пишет:
> Alexander Belchenko wrote:
>> I'd like to confirm my guesses about existing ways to restore bound
>> branch (checkout) with local commits to its state before `bzr update`
>> (implicit merge).
>>
>> IIUC, it can be achieved with
>>
>> bzr unbind
>> bzr pull . --overwrite -r revid:xxx
>> bzr bind
>>
>> Where revid:xxx is the latest local commit revision.
>>
>> To find latest local commit there can be used `bzr heads --dead` or bzr
>> qlog.
>>
>> Is it correct? Or there is better ways?
>>
> 
> If you just did overwrite, then the revision-id prior to update would be
> part of the pending parent ids. I don't think we expose a way to get at
> that revision-id from the command line (we should). Though if you did
> "head .bzr/checkout/dirstate" or wt.get_parent_ids() it would tell you
> what it is.

I've asked about command-line usage. I want to confirm this because this 
recipe will be shown in the article about centralized bzr usage.

> The above commands will, indeed, restore the checkout to what it was
> before the update.

IIUC, if I want to make it automatic via plugin then I just need to set 
branch last_revision info to corresponding revision?

Thanks.




More information about the bazaar mailing list