How to use shelf1?

John Arbash Meinel john at arbash-meinel.com
Thu Dec 3 17:39:50 GMT 2009


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

Óscar Fuentes wrote:
> John Arbash Meinel <john at arbash-meinel.com> writes:
> 
>> ^- Above you just said "bzr shelve --all" not "bzr shelve1 --all". You
>> can't use "bzr shelf1" to work with "shelve" created content.
>>
>> If you wanted to do it that way, you would do:
>>
>> bzr shelve1 --all
>> bzr shelf1 list
> 
> Thanks, John.
> 
> It was surprising for me to discover that bzrtools does not understand
> `shelve'. Nothing on the documentation mentions this.
> 

shelve1 is an older command that uses a completely different way of
storing patches, etc. It is built directly off of diff + patch
executables. shelve (technically shelve v2) uses bzr merge directives to
store the content.

One of the main benefits is that shelve (v2) can handle renames, binary
files, etc.

shelve1 existed for a while because there was a locking bug in shelve
(v2) that kept it from working on Windows. That has since been fixed. At
this point, the only thing shelve1 provides is that you can
interactively unshelve, rather than all or nothing.

As such, I would say it would be best to just remove it entirely. But
I'm not the author of bzrtools.

John
=:->

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

iEYEARECAAYFAksX9+YACgkQJdeBCYSNAANVgwCggmsY5+5eNXMOr+JsDDw47qdN
i4QAmwc48pqqbXCzDnLKT/wvNg7K/DAS
=RV7c
-----END PGP SIGNATURE-----



More information about the bazaar mailing list