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: Fri, 04 Dec 2009 03:57:33 +0100 Message-ID: <87hbs7zbs2.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> <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> <200912040147.nB41ldTH000836@godzilla.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1259895496 15256 80.91.229.12 (4 Dec 2009 02:58:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Dec 2009 02:58:16 +0000 (UTC) Cc: Dan Nicolaescu To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 04 03:58:09 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 1NGOMz-0000Tz-8f for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 03:58:09 +0100 Original-Received: from localhost ([127.0.0.1]:57103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGOMz-0005t8-0s for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 21:58:09 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGOMu-0005sv-GG for emacs-devel@gnu.org; Thu, 03 Dec 2009 21:58:04 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGOMp-0005pL-Tu for emacs-devel@gnu.org; Thu, 03 Dec 2009 21:58:03 -0500 Original-Received: from [199.232.76.173] (port=59515 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGOMp-0005pI-OU for emacs-devel@gnu.org; Thu, 03 Dec 2009 21:57:59 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:48916) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NGOMp-0007CS-9d for emacs-devel@gnu.org; Thu, 03 Dec 2009 21:57:59 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NGOMm-0000QW-P3 for emacs-devel@gnu.org; Fri, 04 Dec 2009 03:57:56 +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 ; Fri, 04 Dec 2009 03:57:56 +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 ; Fri, 04 Dec 2009 03:57:56 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 36 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:cIXBpSTUbQfflHay6darbzvAE3M= 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:118227 Archived-At: Dan Nicolaescu writes: > "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. Exactly my findings. As unshelve essentially does a merge, I do not understand why what Stephen explains is relevant here. Furthermore, Bazaar allows having multiple shelves and unshelving them out-of-order. But I'm not an expert on this area either and possibly I'm missing something. BTW, coding the feature is trivial. Getting it into Bazaar is the difficult part. They have a slow, very stringent process for incorporating changes. They require to sign copyright papers too, something I did for Emacs but wont do for a private business. -- Óscar