From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Julien Danjou Newsgroups: gmane.emacs.devel Subject: Re: ELPA update Date: Thu, 29 Sep 2011 16:09:07 +0200 Message-ID: <87pqijwid8.fsf@keller.adm.naquadah.org> References: <87y5xavz8i.fsf@keller.adm.naquadah.org> <87fwji2d8o.fsf@stupidchicken.com> <87ehz1ds54.fsf@keller.adm.naquadah.org> <87wrcsrczf.fsf@lifelogs.com> <878vp8ahsr.fsf@keller.adm.naquadah.org> <87y5x8poj5.fsf@lifelogs.com> <87k48s60fn.fsf@keller.adm.naquadah.org> <87pqikgnc5.fsf@uwakimon.sk.tsukuba.ac.jp> <8739ffn3dl.fsf@lifelogs.com> <87vcsbwt8h.fsf@keller.adm.naquadah.org> <87wrcrjzjp.fsf@lifelogs.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: dough.gmane.org 1317305376 28474 80.91.229.12 (29 Sep 2011 14:09:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 29 Sep 2011 14:09:36 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Sep 29 16:09:32 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1R9HIn-00027Y-PL for ged-emacs-devel@m.gmane.org; Thu, 29 Sep 2011 16:09:29 +0200 Original-Received: from localhost ([::1]:46536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9HIm-0003Fw-Tm for ged-emacs-devel@m.gmane.org; Thu, 29 Sep 2011 10:09:28 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:45390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9HIb-0003FM-F2 for emacs-devel@gnu.org; Thu, 29 Sep 2011 10:09:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R9HIT-0008KO-JP for emacs-devel@gnu.org; Thu, 29 Sep 2011 10:09:17 -0400 Original-Received: from prometheus.naquadah.org ([212.85.154.174]:44101 helo=mx1.naquadah.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9HIT-0008JX-DV for emacs-devel@gnu.org; Thu, 29 Sep 2011 10:09:09 -0400 Original-Received: from keller.adm.naquadah.org (AMontsouris-651-1-25-129.w82-123.abo.wanadoo.fr [82.123.84.129]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.naquadah.org (Postfix) with ESMTPSA id 41BC25C0F3 for ; Thu, 29 Sep 2011 16:09:08 +0200 (CEST) Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: <87wrcrjzjp.fsf@lifelogs.com> (Ted Zlatanov's message of "Thu, 29 Sep 2011 07:36:26 -0500") User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.90 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.85.154.174 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:144475 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Thu, Sep 29 2011, Ted Zlatanov wrote: > In Git you can cherry-pick between branches, which makes a new commit ID > but the patch contents (including the commit message) are the same. So > that lets you take just one change from one branch to another. It's not > ideal but it's very easy to use and automate. Let's hope nobody will ever modify more than one file/package in a commit. Or your strategy will begin to be much more complicated. :) > If that's too complicated or undesirable in Bazaar and there's no other > way to merge just a few commits from one branch to another, I'm open to > suggestions. I still feel, no matter the merge mechanism, that we > should use the VCS branch and not the package version as the deciding > factor whether to publish a package. I do not disagree, this is actually kind of how the Linux kernel is handled if you look at it that way. But since there's only 2 branches (stable/dev) I'm just not sure it's the best approach here: =2D merging parts of -dev branch into a -stable branch is complicated =2D tagging a branch when it's ready to be publish with so many packages is impossible since developement is happening there on multiple packages at the same time At least, the solution to have a set of tags named "{$package}-ready" which would move on commits will assure that each package is put into ELPA at the right stage. You can even rollback by moving the tag. (I'm just not sure bzr can handle that correctly, and that the bzr users would not make mistakes) =2D-=20 Julien Danjou --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJOhHwDAAoJEGEbqVCLeKXCK14P/A96XHqP0dhHD4ZBPUJtQhwK T4iD6KUxHTXnWJuQTBd/asKu1/Q8mHbRTGc7DRub/jf2FFqs0yq56POK4vg/zHn+ NdEAbAgA0ttB6R28wNnmPaitEj7UaT5NU8pLALvRKyFpIMMNfoGLjBzjmnrwcKYR 3a6N9T9SoCK1wiBtrrn4/C2x91SPYMqD/0iGI7BRBFzwiwsnhGcaK/xIumGBpy+2 5r4lZLmy0s/yaGe0Aky0eF61WcoVQ08dTZw2x+AYLlJUzEU/Q+EYNjWeP0ljlDBB cAqJN/1qDH4OaQlCpuGB3IN88Bq1bKIZwPbvY5Z4ADr4uRam4baV86pPbNyuZnWF 5fwj/UQM3nAqgymXpcKZezy2RECVLYY/EsckbZeTr96MliP4g4r5+/MLX5v0xTvL 99fmstp7ygwaNuhc2tGYl3AGg4AFAM+wo3GjGYxB4Ml8ll8jPPDNM2ubVQJik3cG qxFeMPYT9Ys7Ke/3+A80Ad9BHRexGSAieVDXhLr5W5cvh9CUDpuello/W9sLl85o FrL5YNvUM9JtDoMk4JnPYqTdA6HIIM2Xp7N874AgeP040PhgDT9NVsRSo2J40xPJ kiWz7iIgvTzx8UAtOsZHsNfwqfN9q5hZCydETTsmIhGbwj6GpsjdRg7Gx90N7LmQ 4djFYkEXtsLBjzgh+PvR =09BG -----END PGP SIGNATURE----- --=-=-=--