From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Switching to bzr: what Emacs developers should know? Date: Sat, 08 Aug 2009 15:54:00 -0400 Message-ID: References: <874osi6zpe.fsf@bzg.ath.cx> <28c656e20908081151h55a4b566v4cfc7c49c5ca2a37@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1249761262 32539 80.91.229.12 (8 Aug 2009 19:54:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 8 Aug 2009 19:54:22 +0000 (UTC) Cc: Bastien , emacs-devel@gnu.org To: B Smith-Mannschott Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 08 21:54:15 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 1MZrzY-0001Q3-EV for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2009 21:54:12 +0200 Original-Received: from localhost ([127.0.0.1]:58789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZrzX-0007yI-Lh for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2009 15:54:11 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MZrzT-0007yD-KR for emacs-devel@gnu.org; Sat, 08 Aug 2009 15:54:07 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MZrzO-0007y1-7I for emacs-devel@gnu.org; Sat, 08 Aug 2009 15:54:06 -0400 Original-Received: from [199.232.76.173] (port=38447 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZrzO-0007xy-1X for emacs-devel@gnu.org; Sat, 08 Aug 2009 15:54:02 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:10662) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MZrzN-00023f-O4 for emacs-devel@gnu.org; Sat, 08 Aug 2009 15:54:01 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AuMEAHt0fUpFxL8W/2dsb2JhbACBUs0yhBcFhzg X-IronPort-AV: E=Sophos;i="4.43,346,1246852800"; d="scan'208";a="43196184" Original-Received: from 69-196-191-22.dsl.teksavvy.com (HELO ceviche.home) ([69.196.191.22]) by ironport2-out.teksavvy.com with ESMTP; 08 Aug 2009 15:54:00 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 658A5B40CD; Sat, 8 Aug 2009 15:54:00 -0400 (EDT) In-Reply-To: <28c656e20908081151h55a4b566v4cfc7c49c5ca2a37@mail.gmail.com> (B. Smith-Mannschott's message of "Sat, 8 Aug 2009 20:51:31 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:113817 Archived-At: >> Can someone describe the bzr workflow for Emacs developers? > Presumably, you've seen this, yes?: > http://www.emacswiki.org/emacs/BzrForEmacsDevs >> Will the switch to bzr affect the way upstream packages like Gnus >> or Org are integrated in Emacs development? Of course. Gnus is the special one because it currently benefits from a very nice setup. For Org, I don't think it can get much worse. >> Would there be any advantage of switching to bzr for these packages? > Well, the wiki page currently only says: > TODO: TBD (but frankly, this should be easy, as it fits perfectly with > the DVCS/Bazaar model anyway) Actually, for Gnus it seems not particularly easy, because two-way merges like those Miles currently does don't seem to fit into the Bazaar model nicely at all and because merging two separate package histories into one seems to fit even worse. Stefan