Reverting a single commit
Gordon Tyler
gordon.tyler at gmail.com
Sat Jul 17 20:45:29 BST 2010
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 7/17/2010 11:43 AM, Eli Zaretskii wrote:
> And after I did that, would a simple "bzr revert" get me back to the
> state where that backed up version was part of the tree? I'm asking
> because the section in the manual on reverse cherrypicking says that
> Bazaar doesn't track cherrypicks.
I believe what that means is that it doesn't track cherrypicks for the
purposes of merging (like svn does). For instance, if you cherrypick a
revision, commit that and then merge the whole branch in, bzr might get
confused because some of the changes already exist. The commit of the
cherrypick is not marked as a merge.
If you have a cherrypick in your working tree that you haven't committed
yet, 'bzr revert' should handle it.
Ciao,
Gordon
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJMQghZAAoJEIrPJfWinA2uZM8H/1iDjKYjkCZBiWAPW33sYuNy
AtBvVp3wRiOvkQKCe54wSOvaXQEz/sZPaRdMbvKZcldnol8+xAK4mxL1SPlF1OAh
5b2oQdjtrIGb2Tj28BcbqyWwvoKhdLphkbZBxdENOH5TKZ2q9n9QaRx9w8pdhfaD
EZ5WIT1zF89HT0Ml7kmj+cswTkO/Kr5hKX1OjjdwZXcF5N/yZUiEcObDwKxnYUVl
qut2LVsPs+Bf8p99JLNztzJ2897AfZMLRz7M4cKaZeq1HWf16se9kwiI46a621vk
J3zp/AA3ntEddz3tokIIcMAg6VZTNpIlIPku5vC3L648G8UpCLi6WWtdB9jKTj4=
=rQ+s
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list