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

John Arbash Meinel john at arbash-meinel.com
Mon Jan 11 17:01:29 GMT 2010


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

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.

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

John
=:->

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

iEYEARECAAYFAktLWWkACgkQJdeBCYSNAAPP1ACcCZdtI8RCI1I7kC/1glQME0pr
Z4UAnAsEvJB6BukzU4Vk26R/bvwjNunx
=sGWb
-----END PGP SIGNATURE-----



More information about the bazaar mailing list