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 18:21:57 +0200 Message-ID: <87ei3s2fdm.fsf@wanadoo.es> References: <83ipt4fqyy.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1305994940 30033 80.91.229.12 (21 May 2011 16:22:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 16:22:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 18:22:16 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 1QNowS-0000MC-3D for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 18:22:16 +0200 Original-Received: from localhost ([::1]:39471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNowR-0001yL-7H for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 12:22:15 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:50736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNowO-0001yF-2J for emacs-devel@gnu.org; Sat, 21 May 2011 12:22:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNowN-0005xM-4c for emacs-devel@gnu.org; Sat, 21 May 2011 12:22:12 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:57028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNowM-0005xH-O4 for emacs-devel@gnu.org; Sat, 21 May 2011 12:22:11 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1QNowK-0000I9-LM for emacs-devel@gnu.org; Sat, 21 May 2011 18:22:08 +0200 Original-Received: from 31.red-79-148-47.dynamicip.rima-tde.net ([79.148.47.31]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 May 2011 18:22:08 +0200 Original-Received: from ofv by 31.red-79-148-47.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 May 2011 18:22:08 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 31.red-79-148-47.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:0I4jpcwRBmhYWDRMthcLeMSWTSo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 80.91.229.12 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:139597 Archived-At: Eli Zaretskii writes: [snip] > What can we do to avoid this confusion as result of merges? [snip] Avoid cherry-picking. Always do merges. Create a branch emacs-common and commit there all the changes intended for emacs-23 and trunk. From time to time *merge* (not cherry-pick!) emacs-common into emacs-23 and trunk. Long time ago I advised against mixing cherry-picks and merges and suggested this strategy, but was discarded because it is too complex. I'm sure that as time passes and you get bitten again and again by the current practice it will finally look extremely simple.