<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On 3 Dec 2009, at 16:16, Óscar Fuentes wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>John Szakmeister <<a href="mailto:john@szakmeister.net">john@szakmeister.net</a>> writes:<br><br><blockquote type="cite">On Thu, Dec 3, 2009 at 3:28 AM, Óscar Fuentes <<a href="mailto:ofv@wanadoo.es">ofv@wanadoo.es</a>> wrote:<br></blockquote><blockquote type="cite"><blockquote type="cite">After editing some files, I shelve the changes:<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">bzr shelf --all<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">oscar@qcore:~/dev/other/bzr-emacs/trunk$ bzr shelve --all<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Selected changes:<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> M INSTALL<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"> M README<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Changes shelved with id "1".<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Now I try to see the contents of the shelve:<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">oscar@qcore:~/dev/other/bzr-emacs/trunk$ bzr shelf1 list<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Patches on shelf '1': None<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">oscar@qcore:~/dev/other/bzr-emacs/trunk$ bzr shelf1 switch 1<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Default shelf is now '1'<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">oscar@qcore:~/dev/other/bzr-emacs/trunk$ bzr shelf1 list<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Patches on shelf '1': None<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">What I'm doing wrong?<br></blockquote></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Use "bzr shelve --list".<br></blockquote><br>That is for listing shelves, not for viewing the *contents* of a shelve.<br><br><blockquote type="cite">"shelf1" is actually from bzrtools and a<br></blockquote><blockquote type="cite">modified version of that became "shelve" in the bzr core.<br></blockquote><br>Nope, the bzrtools implementation of `shelve' is `shelve1'. I'm talkng<br>about `shelf1' here.<br><br>[snip]<br><br>-- <br>Óscar<br><br><br></div></blockquote></div><br><div>actually shelf1 does belong to bzrtools ...</div><div><div><div><font class="Apple-style-span" face="Courier" size="3"><span class="Apple-style-span" style="font-size: 12px;">> bzr help commands | grep shel[fv]</span></font></div><div><font class="Apple-style-span" face="Courier" size="3"><span class="Apple-style-span" style="font-size: 12px;">shelf1 Perform various operations on your shelved patches. See</span></font></div><div><font class="Apple-style-span" face="Courier" size="3"><span class="Apple-style-span" style="font-size: 12px;"> also shelve1. [bzrtools]</span></font></div><div><font class="Apple-style-span" face="Courier" size="3"><span class="Apple-style-span" style="font-size: 12px;">shelve Temporarily set aside some changes from the current tree.</span></font></div><div><font class="Apple-style-span" face="Courier" size="3"><span class="Apple-style-span" style="font-size: 12px;">shelve1 Temporarily set aside some changes from the current tree. [bzrtools]</span></font></div><div><font class="Apple-style-span" face="Courier" size="3"><span class="Apple-style-span" style="font-size: 12px;">unshelve Restore shelved changes.</span></font></div><div><font class="Apple-style-span" face="Courier" size="3"><span class="Apple-style-span" style="font-size: 12px;">unshelve1 Restore shelved changes. [bzrtools]</span></font></div><div><font class="Apple-style-span" face="Courier"><br></font></div><div><font class="Apple-style-span" face="Courier">AFAIK, shelve and unshelve1 don't work together, so my guess is that shelf1 doesn't work on shelve(without 1)</font></div><div><br></div></div></div></body></html>