From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: State of the repository conversion Date: Thu, 20 Mar 2014 18:17:09 +0200 Message-ID: <83d2hg975m.fsf@gnu.org> References: <20140319175124.BCCB3380835@snark.thyrsus.com> <83wqfq82ge.fsf@gnu.org> <20140319185416.GA25588@thyrsus.com> <83siqe80bj.fsf@gnu.org> <87siqdiven.fsf@uwakimon.sk.tsukuba.ac.jp> <83ior98qi4.fsf@gnu.org> <87lhw5qyx9.fsf@wanadoo.es> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1395332225 15397 80.91.229.3 (20 Mar 2014 16:17:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Mar 2014 16:17:05 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 20 17:17:12 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WQfeY-0006aT-Rs for ged-emacs-devel@m.gmane.org; Thu, 20 Mar 2014 17:17:10 +0100 Original-Received: from localhost ([::1]:48048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQfeY-0003bP-C2 for ged-emacs-devel@m.gmane.org; Thu, 20 Mar 2014 12:17:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQfeR-0003a7-0O for emacs-devel@gnu.org; Thu, 20 Mar 2014 12:17:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQfeL-0003bO-AP for emacs-devel@gnu.org; Thu, 20 Mar 2014 12:17:02 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:49943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQfeL-0003bE-2e for emacs-devel@gnu.org; Thu, 20 Mar 2014 12:16:57 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0N2Q00G00T75WB00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 20 Mar 2014 18:16:55 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N2Q00GH9T87HJA0@a-mtaout22.012.net.il>; Thu, 20 Mar 2014 18:16:55 +0200 (IST) In-reply-to: <87lhw5qyx9.fsf@wanadoo.es> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:170626 Archived-At: > From: =D3scar Fuentes > Date: Thu, 20 Mar 2014 05:25:22 +0100 >=20 > Eli Zaretskii writes: >=20 > > E.g., the way we merge from the release branch is due > > to the fact that bzr doesn't track cherry-picks. Git does. >=20 > No, it doesn't. Maybe with magit ;-) =46rom the command line, there's the -x switch to cherry-pick, which does, sort of. The question is, do we want that service? > Which reminds me of a comment I made long time ago: applying fixes = on > the maintenance branch and then cherry-picking them into the develo= pment > branch lowers the quality of the history of the development branch, > which is the everlasting one, while the maintenance branch will > eventually freeze and become almost irrelevant. That's another issue that I think is worth discussing. E.g., GDB applies fixes to the trunk, and then cherry-picks some of them to the release branch. But then GDB doesn't keep the release branch for ver= y long, and never makes more than 2 versions out of it, so I'm not sure that example is good for Emacs. (I hope now you agree that using or not using magit is not the important issue here.)