From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: support for bzr shelve/unshelve in vc-dir Date: Thu, 3 Dec 2009 11:17:49 -0800 (PST) Message-ID: <200912031917.nB3JHnKX027584@godzilla.ics.uci.edu> References: <200912011947.nB1JlaAp027561@godzilla.ics.uci.edu> <200912030748.nB37m5V4022253@godzilla.ics.uci.edu> <87k4x431n2.fsf@telefonica.net> <200912030907.nB39781X022853@godzilla.ics.uci.edu> <873a3s2cp9.fsf@telefonica.net> <87my1z2a6h.fsf@telefonica.net> <200912031848.nB3ImpMj027352@godzilla.ics.uci.edu> <87aaxz287w.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1259867986 4897 80.91.229.12 (3 Dec 2009 19:19:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2009 19:19:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 03 20:19:39 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 1NGHDH-00011N-59 for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 20:19:39 +0100 Original-Received: from localhost ([127.0.0.1]:48527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGHDG-0007HQ-Ln for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 14:19:38 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGHDA-0007Gc-Qa for emacs-devel@gnu.org; Thu, 03 Dec 2009 14:19:32 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGHD5-00079M-2c for emacs-devel@gnu.org; Thu, 03 Dec 2009 14:19:31 -0500 Original-Received: from [199.232.76.173] (port=43409 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGHD4-000796-U2 for emacs-devel@gnu.org; Thu, 03 Dec 2009 14:19:26 -0500 Original-Received: from paul-mcgann-v0.ics.uci.edu ([128.195.1.147]:39172) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NGHD4-00010l-8p for emacs-devel@gnu.org; Thu, 03 Dec 2009 14:19:26 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by paul-mcgann-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id nB3JHnoE015770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Dec 2009 11:17:49 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id nB3JHnKX027584; Thu, 3 Dec 2009 11:17:49 -0800 (PST) In-Reply-To: <87aaxz287w.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Thu, 03 Dec 2009 20:00:51 +0100") Original-Lines: 33 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: nB3JHnoE015770 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu 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:118200 Archived-At: =C3=93scar Fuentes writes: > Dan Nicolaescu writes: >=20 > > > Further discussion on the bazaar ml indicates that using shelve1/= shelf1 > > > is not a good idea. > > > > Can you please forward 2 feature requests for shelve/unshelve then: > > 1. some way to show the diff >=20 > This is underway. Good, code to support it is there, but commented out. > > 2. something similar to "git stash apply", i.e. apply the shelf but do > > not remove it. This makes it easy to split changes for example. >=20 > Would you care to describe a plausible scenario where this is useful? > I can't think of one rigth now. Say you have something shelved. You want to try to refine the change, unshelve it and continue working on it. If you realize that what you had before was better, there's no easy way to go back. Or if you want to split a change:=20 shelve apply remove the part you don't want shelve the partial change unshelve the original remove some other part shelve again