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 20:19:07 +0100 Message-ID: <8762wfilec.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> <837hgv605e.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288729416 5450 80.91.229.12 (2 Nov 2010 20:23:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 20:23:36 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 21:23:32 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 1PDNOA-0006hR-Qe for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 21:23:27 +0100 Original-Received: from localhost ([127.0.0.1]:52893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDMqh-0002wG-4T for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 15:48:51 -0400 Original-Received: from [140.186.70.92] (port=52156 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDMmC-000796-8L for emacs-devel@gnu.org; Tue, 02 Nov 2010 15:44:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDMO9-0008M7-E2 for emacs-devel@gnu.org; Tue, 02 Nov 2010 15:19:22 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:58147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDMO9-0008Lx-7C for emacs-devel@gnu.org; Tue, 02 Nov 2010 15:19:21 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PDMO7-0005Xw-Jk for emacs-devel@gnu.org; Tue, 02 Nov 2010 20:19:19 +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 20:19:19 +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 20:19:19 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 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:21L8u9gFqCf/HBTmqRNRTByxHmg= 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:132298 Archived-At: Eli Zaretskii writes: >> BTW, do you realize that the script would end cherry-picking commits > > Can't it instead do a merge and then reverse cherry-pick the revisions > that should not be merged? That's an option. It would be effective even for an human operator, as the number of commits on emacs-23 not intented for trunk is so small (that would not save the time required for reviewing the log messages looking for some text flagging that condition, though) IMO it is not a good thing to create revert commits as part of a process. In this case, they will break bisecting and add potential confussion to the VC history. For instance: the merged commits will be hidden by default on level 1 of the DAG, but the reverting commits will be always visible on the leftmost level of the DAG, unless you complicate things by creating a branch containing the revert commits and merge it into trunk. It is desirable that patches not intended for trunk should never be on trunk.