Q: Ways to explain/teach revert vs. update?

[Gordon Tyler]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
 
On 5/20/2011 2:05 PM, Eli Zaretskii wrote:
>
>> Revert changes files from a working tree (or by default the whole
>> tree) to be
> ^^^^^^^^^^^^^^^^^^^^ You probably meant to say "Revert changes in
> specified FILES".
>

Actually, I believe he means "The revert command changes files...."

>> Using "bzr revert --forget-merges", it is possible to apply all
>> of the changes from a branch in a single revision. To do this,
>> perform the merge as desired. Then doing revert with the
>> "--forget-merges" option will keep the content of the tree as it
>> was, but it will clear the list of pending merges. The next
>> commit will then contain all of the changes that are present in
>> the other branch, but without any other parent revisions.
>
> I would suggest to mention "rebase" here, because that's what this
> does, right?

Nope. revert --forget-merges makes a series of commits appear as a
single commit with only one parent when merging them into another
branch. You lose the history of the individual commits.

Rebase will replay a series of commits on top of the tip of the parent
branch to make it look like each commit has been made since branching
from the parent's tip.

Ciao,
Gordon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
iQEcBAEBAgAGBQJN1xRVAAoJEIrPJfWinA2uC4cH/1PE5VG6QnXOEcpqGcWMmood
66bx2K5ImljlZYcW1TL9I3ww38FRpaQqxYCRhnrkjY4D2fqIrNK1b22DzHDKZRSx
aLLInzDrnxlhOQWS+KJRONOrPNNt72wRyWLnoeqjXU2FxitSH5YCC8w2973SKy8P
FaSiKUtFzpRJpeEZfmWs2LvSNogJ+FRNCjt51hX8dM1JS1z1n9o1ddRSHH1Mizc0
KFtTy5gSlarB0ifIcRNB9mnWUKeKgRRWtVGbR3MjmeO8Tyvned7RyKKoZ+w6h7EP
96d3DqR3DjTSSthQ/3w0fcXaVmhBZOVtk4LgZWWZGNCqrNTPwK6Tey/85LW32yk=
=KCaN
-----END PGP SIGNATURE-----