From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Sun, 22 May 2011 13:33:40 +0200 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <87ei3s2fdm.fsf@wanadoo.es> <87aaeg2dl7.fsf@wanadoo.es> <871uzs2cp7.fsf@wanadoo.es> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1306064073 13378 80.91.229.12 (22 May 2011 11:34:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 May 2011 11:34:33 +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 Sun May 22 13:34:25 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 1QO6vR-0007Hx-2l for ged-emacs-devel@m.gmane.org; Sun, 22 May 2011 13:34:25 +0200 Original-Received: from localhost ([::1]:47930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO6vP-0005HI-Tc for ged-emacs-devel@m.gmane.org; Sun, 22 May 2011 07:34:23 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:48646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO6vO-0005HD-3z for emacs-devel@gnu.org; Sun, 22 May 2011 07:34:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QO6vN-0006uq-3W for emacs-devel@gnu.org; Sun, 22 May 2011 07:34:22 -0400 Original-Received: from mail-gw0-f41.google.com ([74.125.83.41]:43247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO6vN-0006ul-0h for emacs-devel@gnu.org; Sun, 22 May 2011 07:34:21 -0400 Original-Received: by gwaa12 with SMTP id a12so2198165gwa.0 for ; Sun, 22 May 2011 04:34:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type:content-transfer-encoding; bh=0pCjDlOJtmS/lV6Tc/vKWfplbEoC6modNhKLUpSkfHE=; b=MinnuMCG6VFbuuGXjlNYUrZwfMNTjep1tS2SzRJDf2e4ytZie/i0ISuLi9GJSVTx7w FFo6UYfHuJ8Cto0zp3abkK3vj3dNa3Yjt+T3CYTkQP9B9f4NbxdonLHLQ4OotEDW+xIt m/U/ZGD9e+jlvElnnKelYT2WxBGWrR/3fnUMA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=RD/Cv8fxYZ6ZL3BSFasZ0CFECkyRTInldOBTZ9/r+ZbcP0F+mKNqMksbrztdwM+g9+ jcM5tGmeOYRy9feZEgX6GvFdeH9yh0WZS/viw46OtUO7tpx4CHnK3HHNeLOCNy2QyUOw Lc3yGMBL9veC3FOnyf0HfB5flE9G59CJyKSN8= Original-Received: by 10.236.183.233 with SMTP id q69mr1449712yhm.402.1306064060086; Sun, 22 May 2011 04:34:20 -0700 (PDT) Original-Received: by 10.147.167.11 with HTTP; Sun, 22 May 2011 04:33:40 -0700 (PDT) In-Reply-To: <871uzs2cp7.fsf@wanadoo.es> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.83.41 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:139618 Archived-At: > One thing fundamentally wrong with the current practice is that emacs-23 > ends with a mostly clean VC history while trunk accumulates all the mess > created by cherry-picks. emacs-23 will eventually die, but trunk is > supposed to live forever. I couldn't agree more. We should commit to the trunk and then decide what gets backported to emacs-23. =C2=A0 =C2=A0 Juanma