Reverting a single commit

[Gordon Tyler]

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

On 7/17/2010 6:50 AM, John Szakmeister wrote:
> On Sat, Jul 17, 2010 at 6:30 AM, Eli Zaretskii <eliz at gnu.org> wrote:
>>> Date: Sat, 17 Jul 2010 06:26:54 -0400
>>> From: John Szakmeister <john at szakmeister.net>
>>> Cc: Bazaar <bazaar at lists.canonical.com>
>>>
>>> 'bzr merge -r X..X-1 .' should do the trick.
>>
>> Thanks.  Shouldn't it be "bzr merge -r X-1..X+1", though?  If not, I
>> might be missing something subtle in how "merge" handles the revision
>> ID.
> 
> No, what your command does is say "cherry pick revisions X-1, X, and
> X+1.".  It brings *in* the changes from X-1, X, and X+1.
> 
> The command I gave is called a "reverse cherry pick".  It basically
> says *back out* the changes introduced in X.  The catch here is that
> the X-1 is exclusive rather than inclusive.

The way I think of it is "merge the diff from X to X-1 into my working
copy".


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

iQEcBAEBAgAGBQJMQalKAAoJEIrPJfWinA2ur4kH/ir3y8KHcaBr7f+AoaUbjUmJ
dNLBT/G9zCClidcZ7HRdT5gWKFLsOpb0Bpb72KeCmK8kU4jBxhSIfKD+EhcIMiuv
Xt7lgp1pxaRPAzw6ESCbGy3Rt6g7ImtKki91Rzgm+uQt7F2hsdLmjvmSjR3x1kzE
CYxBgoCfPcvcvGonutgZR68wQdYyXqYHia+c1l7OO8M+528qL1Sh1Y/2XRDWBNGe
a/f24mYkWMk89j9o+nWXFctWOAFqFxPrQii3PYPogqxoNbWQMi/DztAtQEhi+EMt
e5RcBAVU5xKR45DR/l7mwssiKJ3A8MqXqxK/O/RcQngIjoC8cb6SwGX7TRqTLPs=
=5gHO
-----END PGP SIGNATURE-----