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: Incorrect merge Date: Wed, 03 Nov 2010 07:46:06 +0100 Message-ID: <87oca6hpld.fsf@telefonica.net> References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87hbg0jxyu.fsf@uwakimon.sk.tsukuba.ac.jp> <87d3qnk9am.fsf@telefonica.net> <87k4kvwu6w.fsf@uwakimon.sk.tsukuba.ac.jp> <8762wfk5r0.fsf@telefonica.net> <87eib3wp4j.fsf@uwakimon.sk.tsukuba.ac.jp> <87fwvjimg2.fsf@telefonica.net> <87d3qnwk0v.fsf@uwakimon.sk.tsukuba.ac.jp> <87wrovh2vl.fsf@telefonica.net> <871v73c775.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288766807 10334 80.91.229.12 (3 Nov 2010 06:46:47 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 3 Nov 2010 06:46:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 03 07:46:43 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PDX7K-0000Ad-J9 for ged-emacs-devel@m.gmane.org; Wed, 03 Nov 2010 07:46:42 +0100 Original-Received: from localhost ([127.0.0.1]:43915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDX7J-0002bZ-R7 for ged-emacs-devel@m.gmane.org; Wed, 03 Nov 2010 02:46:41 -0400 Original-Received: from [140.186.70.92] (port=42503 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDX7C-0002bP-0G for emacs-devel@gnu.org; Wed, 03 Nov 2010 02:46:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDX7A-0003xR-H4 for emacs-devel@gnu.org; Wed, 03 Nov 2010 02:46:33 -0400 Original-Received: from impaqm1.telefonica.net ([213.4.138.17]:15149 helo=telefonica.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDX7A-0003x2-6o for emacs-devel@gnu.org; Wed, 03 Nov 2010 02:46:32 -0400 Original-Received: from IMPmailhost1.adm.correo ([10.20.102.38]) by IMPaqm1.telefonica.net with bizsmtp id SWQ51f0020piX6q01WmVDK; Wed, 03 Nov 2010 07:46:29 +0100 Original-Received: from qcore ([83.42.13.98]) by IMPmailhost1.adm.correo with BIZ IMP id SWm71f00226vsmB1hWm7l8; Wed, 03 Nov 2010 07:46:29 +0100 X-Brightmail-Tracker: AAAAAA== X-original-sender: 981711563@telefonica.net In-Reply-To: <871v73c775.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Wed, 03 Nov 2010 14:22:22 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132313 Archived-At: "Stephen J. Turnbull" writes: [snip] > Your way requires all committers who fix bugs to worry about which > branch to commit to. Yes, exactly as it happens right now. Maybe you didn't notice that people commit to emacs-23 (and to emacs-23 only) whenever the fix applies to that release, and to trunk only otherwise. Then, from time to time, some maintainer merges (or, more precisely, cherry picks) emacs-23 into trunk. This means that people already need to figure out where to commit their fixes. Replacing emacs-23 with common-fixes here seems a tiny change on the workflow to me, much less burdensome than waiting for the availability and using a script that fakes cherry-pick tracking on bzr. (Good luck writing that script. It looks much harder to do than on the svn case, if possible at all without extending the repository format.)