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 17:47:39 -0800 (PST) Message-ID: <200912040147.nB41ldTH000836@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> <200912031917.nB3JHnKX027584@godzilla.ics.uci.edu> <87my1zzqxq.fsf@telefonica.net> <200912032257.nB3Mv97m029382@godzilla.ics.uci.edu> <87d42vvabf.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259891378 6307 80.91.229.12 (4 Dec 2009 01:49:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Dec 2009 01:49:38 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 04 02:49:31 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 1NGNIZ-000478-0l for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 02:49:31 +0100 Original-Received: from localhost ([127.0.0.1]:33866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGNIY-0001ba-NI for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 20:49:30 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGNIS-0001ZC-D2 for emacs-devel@gnu.org; Thu, 03 Dec 2009 20:49:24 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGNIN-0001WL-Me for emacs-devel@gnu.org; Thu, 03 Dec 2009 20:49:24 -0500 Original-Received: from [199.232.76.173] (port=49714 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGNIN-0001WD-IZ for emacs-devel@gnu.org; Thu, 03 Dec 2009 20:49:19 -0500 Original-Received: from colin-baker-v0.ics.uci.edu ([128.195.1.153]:38695) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NGNIN-0002SG-Fe for emacs-devel@gnu.org; Thu, 03 Dec 2009 20:49:19 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by colin-baker-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id nB41leUc017162 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Dec 2009 17:47:40 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id nB41ldTH000836; Thu, 3 Dec 2009 17:47:39 -0800 (PST) In-Reply-To: <87d42vvabf.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Fri, 04 Dec 2009 09:42:44 +0900") Original-Lines: 19 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: nB41leUc017162 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:118223 Archived-At: "Stephen J. Turnbull" writes: > Dan Nicolaescu writes: > > > I know nothing about bzr, but unshelve --keep is gotta be trivial to > > implement... > > It's not, because the shelf is kept in the history. Unshelving needs > to rewind the history so that tip points to the pre-shelve revision. > bzr has no refs, so recovering the shelved revision after an unshelve > is non-trivial. It may not be hard, either, except that for it to be > reliable may require the bzr developers to make promises about internal > storage management. A several months old bzr tree happens to be my playground for testing VC changes on bzr. I changed "delete_shelf" to always be True in bzrlib/shelf_ui.py, and now "bzr unshelve --apply" does not remove shelves, and they seem to be valid and can be applied multiple times.