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: Tue, 02 Nov 2010 19:56:29 +0100 Message-ID: <87fwvjimg2.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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288724394 13187 80.91.229.12 (2 Nov 2010 18:59:54 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 18:59:54 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 19:59:50 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 1PDM3U-0007m7-Fe for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 19:59:50 +0100 Original-Received: from localhost ([127.0.0.1]:33698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDM3C-0000AF-4H for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 14:57:42 -0400 Original-Received: from [140.186.70.92] (port=33869 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDM2f-00080Z-1f for emacs-devel@gnu.org; Tue, 02 Nov 2010 14:57:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDM2K-00056F-05 for emacs-devel@gnu.org; Tue, 02 Nov 2010 14:56:49 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:45650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDM2J-00056B-L3 for emacs-devel@gnu.org; Tue, 02 Nov 2010 14:56:47 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PDM2C-00072t-Vx for emacs-devel@gnu.org; Tue, 02 Nov 2010 19:56:40 +0100 Original-Received: from 83.42.13.98 ([83.42.13.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 19:56:40 +0100 Original-Received: from ofv by 83.42.13.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 19:56:40 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 45 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.13.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:uOjwbw1kiLZi1qmhN/F7JHmOnUg= 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:132296 Archived-At: "Stephen J. Turnbull" writes: > > Adding an extra branch does not increase the current workload. > > Of course it does. Most occasional developers work only on the branch > that they use every day, either trunk or stable/maintenance. That's > where they test, that's where they refine. Adding the common-fixes > branch means they need to clone and maintain that branch, and work in > a branch that they don't use. Almost every change on emacs-23 is intended to trunk too. Right now those changes that are exclusive to emacs-23 must be flagged somehow. Adding common-fixes just means that people working on emacs-23 will work on common-fixes, except for those cases where they would flag the change as belonging to emacs-23 only. Not so hard, IMO. > Even for frequent contributors who help with porting patches back and > forth between the branches, this requires more thinking about where > you should do the work. Uh? With common-fixes you merge the commits there into emacs-23 and trunk. That's all. > > They would commit to common-fixes the same way they do for emacs-23. > > You mean, stuff that doesn't belong there, as started this thread? ;-) The problem was that commits intended to emacs-23 were merged into trunk. Yes, people can do all kinds of mistakes, but no script will magically avoid them. [snip] > > when there are standard practices on dVCS for properly solving the > > problem at hand. > > But there aren't. Only Darcs supports cherry-picking properly. You are missing the point. common-fixes will eliminate the need for cherry-picking (and for examining each commit on emacs-23 before merging into trunk). The maintainers save time and the VC history is consistent (with commits maintaining its identity on the branches where they are installed) [snip]