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: Fri, 4 Dec 2009 13:18:28 -0800 (PST) Message-ID: <200912042118.nB4LIS4j009931@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> <200912040147.nB41ldTH000836@godzilla.ics.uci.edu> <87hbs7zbs2.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 1259961632 15981 80.91.229.12 (4 Dec 2009 21:20:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Dec 2009 21:20:32 +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 Fri Dec 04 22:20:24 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 1NGfZb-0004ia-70 for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 22:20:21 +0100 Original-Received: from localhost ([127.0.0.1]:50769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGfZZ-000081-TH for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 16:20:17 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGfZT-0008WI-3y for emacs-devel@gnu.org; Fri, 04 Dec 2009 16:20:11 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGfZO-0008Mw-Cw for emacs-devel@gnu.org; Fri, 04 Dec 2009 16:20:10 -0500 Original-Received: from [199.232.76.173] (port=54108 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGfZO-0008Mb-3m for emacs-devel@gnu.org; Fri, 04 Dec 2009 16:20:06 -0500 Original-Received: from colin-baker-v0.ics.uci.edu ([128.195.1.153]:54724) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NGfZN-0004pm-Lr for emacs-devel@gnu.org; Fri, 04 Dec 2009 16:20:06 -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 nB4LISDr028325 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 4 Dec 2009 13:18:28 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id nB4LIS4j009931; Fri, 4 Dec 2009 13:18:28 -0800 (PST) In-Reply-To: <87hbs7zbs2.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Fri, 04 Dec 2009 03:57:33 +0100") Original-Lines: 39 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: nB4LISDr028325 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:118276 Archived-At: =C3=93scar Fuentes writes: > Dan Nicolaescu writes: >=20 > > "Stephen J. Turnbull" writes: > > > > > Dan Nicolaescu writes: > > >=20 > > > > I know nothing about bzr, but unshelve --keep is gotta be triv= ial to > > > > implement...=20 > > >=20 > > > It's not, because the shelf is kept in the history. Unshelving n= eeds > > > to rewind the history so that tip points to the pre-shelve revisi= on. > > > bzr has no refs, so recovering the shelved revision after an unsh= elve > > > is non-trivial. It may not be hard, either, except that for it t= o be > > > reliable may require the bzr developers to make promises about in= ternal > > > 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. >=20 > Exactly my findings. >=20 > 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. >=20 > 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. Please don't give up. The change quite likely would not require copyright assignment: it's very small and it's probably the only way to implement the feature.