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

[John Arbash Meinel]

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

On 5/19/2011 3:52 AM, Brian de Alwis wrote:
> On 18-May-2011, at 2:53 PM, Martin Pool wrote:
>> bzr revert resets the working files to the given revision, which
>> defaults to being the basis revision of the tree.  It never changes
>> the basis revision, and it throws away your local changes.
>>
>> bzr update merges your uncommitted changes (relative to the current
>> basis) with the target revision, and writes the result into the
>> working files.  It then sets the basis to the target revision.
> 
> And 'pull —overwrite' is like a revert but also sets the basis revision of the tree.  
> 
> Is 'update' different from 'uncommit' if update also sets the basis to the target revision?

Update is different from 'uncommit' in that uncommit changes the branch
tip and the tree basis revision, but does not change the working tree state.

John
=:->

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

iEYEARECAAYFAk3UtBIACgkQJdeBCYSNAAMSjwCgptI2XJlzfQpMXG6VeQhIFaDr
K1QAmgLgwbC5gJmztDenS4AoLEk1ockl
=Lm7b
-----END PGP SIGNATURE-----