Possibly dumb question about shelving

[Aaron Bentley]

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

Russel Winder wrote:
> Is there a difference between:
> 
> 	bzr shelve
> 	bzr shelve1
> 
> If so then perhaps the documentation from "bzr help . . . " regarding
> the shel.*(1)? commands needs some attention to draw out the
> differences?

Here are some of the differences:

shelve can shelve all kinds of changes, including file addition,
deletion and kind changes.  shelve1 can shelve only text changes.

shelve and shelve1 cannot read/write each others' formats.  shelve
stores its changes as a serialized TreeTransform.  shelve1 stores its
changes as a patch.

shelve has a single, unnamed stack for storing changes on.  shelve1 can
have multiple, named stacks.

unshelve is implemented using merge, so it produces standard merge
conflicts.  unshelve1 is implemented using patch, so it produces .orig
and .rej files.  This means that unshelve1 has external dependencies and
shelve does not.

shelve and shelve1 have different UI.

shelve1 has had better Windows compatibility than shelve, though I
understand that has recently been fixed.

shelve is part of bzr, and shelve1 is part of bzrtools.

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

iEYEARECAAYFAkplvvoACgkQ0F+nu1YWqI0JmwCaA70wMRVL/B0SGfqfEqmojO5Z
9uIAn398RzqJkHdFt69Y1grIsLu/sFGp
=lpZN
-----END PGP SIGNATURE-----