From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 19:00:36 +0200 Message-ID: <87aaeg2dl7.fsf@wanadoo.es> References: <83ipt4fqyy.fsf@gnu.org> <87ei3s2fdm.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 1305997252 8862 80.91.229.12 (21 May 2011 17:00:52 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 17:00:52 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 19:00:48 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 1QNpXk-0007py-0Z for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 19:00:48 +0200 Original-Received: from localhost ([::1]:56595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpXj-0005R6-GA for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 13:00:47 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:48725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpXg-0005Qp-HX for emacs-devel@gnu.org; Sat, 21 May 2011 13:00:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNpXf-0002zc-CV for emacs-devel@gnu.org; Sat, 21 May 2011 13:00:44 -0400 Original-Received: from impaqm5.telefonica.net ([213.4.138.21]:46712 helo=telefonica.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpXf-0002zV-08 for emacs-devel@gnu.org; Sat, 21 May 2011 13:00:43 -0400 Original-Received: from IMPmailhost3.adm.correo ([10.20.102.124]) by IMPaqm5.telefonica.net with bizsmtp id mGH11g00M2h2L9m3RH0fM9; Sat, 21 May 2011 19:00:39 +0200 Original-Received: from qcore ([79.148.47.31]) by IMPmailhost3.adm.correo with BIZ IMP id mH0c1g00u0gNGdb1jH0dyg; Sat, 21 May 2011 19:00:39 +0200 X-Brightmail-Tracker: AAAAAA== X-original-sender: 981711563@telefonica.net In-Reply-To: (Andreas Schwab's message of "Sat, 21 May 2011 18:42:05 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 213.4.138.21 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:139601 Archived-At: Andreas Schwab writes: > =C3=93scar Fuentes writes: > >> Avoid cherry-picking. Always do merges. > > Cherry-picks are a fact of life. You cannot avoid them completely. Never cherry-pick from emacs-common. Why would you cherry pick from emacs-common into emacs-23 or trunk, instead of just merging? >> Create a branch emacs-common and commit there all the changes >> intended for emacs-23 and trunk. > > And how do you know with 100% reliability? You don't know with 100% reliability. If a change committed into emacs-common does not belong there, do the same you do with the rest of wrong commits: revert it. I'm not saying that the proposed schema is perfect, it simply is better than what we do now.