From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: support for bzr shelve/unshelve in vc-dir Date: Thu, 03 Dec 2009 18:24:02 +0100 Message-ID: <873a3s2cp9.fsf@telefonica.net> References: <200912011947.nB1JlaAp027561@godzilla.ics.uci.edu> <200912030748.nB37m5V4022253@godzilla.ics.uci.edu> <87k4x431n2.fsf@telefonica.net> <200912030907.nB39781X022853@godzilla.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259862557 18663 80.91.229.12 (3 Dec 2009 17:49:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2009 17:49:17 +0000 (UTC) Cc: Dan Nicolaescu To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 03 18:49:10 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NGFnS-0000CJ-0u for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 18:48:54 +0100 Original-Received: from localhost ([127.0.0.1]:48759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGFnR-00088H-M7 for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 12:48:53 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGFPy-0005On-ER for emacs-devel@gnu.org; Thu, 03 Dec 2009 12:24:38 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGFPt-0005Iw-8n for emacs-devel@gnu.org; Thu, 03 Dec 2009 12:24:37 -0500 Original-Received: from [199.232.76.173] (port=54320 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGFPs-0005Ig-V6 for emacs-devel@gnu.org; Thu, 03 Dec 2009 12:24:33 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:33225) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NGFPs-0004zt-IY for emacs-devel@gnu.org; Thu, 03 Dec 2009 12:24:32 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NGFPk-0008KO-P4 for emacs-devel@gnu.org; Thu, 03 Dec 2009 18:24:24 +0100 Original-Received: from 112.red-83-38-73.dynamicip.rima-tde.net ([83.38.73.112]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 03 Dec 2009 18:24:24 +0100 Original-Received: from ofv by 112.red-83-38-73.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 03 Dec 2009 18:24:24 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 43 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 112.red-83-38-73.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) Cancel-Lock: sha1:qIthzv1623RgugiVUmBcD9grmlQ= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:118189 Archived-At: Dan Nicolaescu writes: [snip] > > > I couldn't find a way to display the content of a shelf, so support for > > > that is missing. > > > > As mentioned on a previous message, `bzr shelf1 list' should do what you > > need. It is from bzrtools, which is a popular plugin. However, the > > command either is broken or I don't know how to use it. I'll ask on the > > bazaar ml. > > bzr shelf1 list doesn't even show shelves created with bzr shelve... Someone told me that bzrtools' `shelf1' only works with bzrtools' `shelve1'. It is incompatible with with bzr's `shelve'. For looking at the changes on a shelve1, you need `bzr shelf1 list', which lists the patches, and `bzr shelf1 show PATCH', which actually shows the patch: scar@qcore:~/dev/other/bzr-emacs/trunk$ bzr shelve1 --all Shelving to 1/00: "Changes shelved on 2009-12-03 18:12:08" oscar@qcore:~/dev/other/bzr-emacs/trunk$ bzr shelf1 list Patches on shelf '1': 00: Changes shelved on 2009-12-03 18:12:08 oscar@qcore:~/dev/other/bzr-emacs/trunk$ bzr shelf1 show 00 # Shelved patch: Changes shelved on 2009-12-03 18:12:08 --- INSTALL 2009-09-13 22:15:10 +0000 +++ INSTALL 2009-12-03 17:12:01 +0000 @@ -811,3 +811,4 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . +foo --- README 2009-06-21 04:46:07 +0000 +++ README 2009-12-03 17:12:01 +0000 @@ -107,3 +107,4 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . +zoo