From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522. Date: Wed, 01 Oct 2014 13:44:32 -0400 Message-ID: References: <23194.1412094213@olgas.newt.com> <87sij8v6ut.fsf@uwakimon.sk.tsukuba.ac.jp> <83tx3nkfy3.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1412185523 15501 80.91.229.3 (1 Oct 2014 17:45:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Oct 2014 17:45:23 +0000 (UTC) Cc: "Stephen J. Turnbull" , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 01 19:45:16 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XZNxg-0004ND-E5 for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 19:45:12 +0200 Original-Received: from localhost ([::1]:57330 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZNxf-0001BU-Ri for ged-emacs-devel@m.gmane.org; Wed, 01 Oct 2014 13:45:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZNxJ-00018v-2u for emacs-devel@gnu.org; Wed, 01 Oct 2014 13:44:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZNxB-0000Vv-L2 for emacs-devel@gnu.org; Wed, 01 Oct 2014 13:44:49 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:60767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZNx3-0000UD-PO; Wed, 01 Oct 2014 13:44:33 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVNFxKjo/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCws0EhQYDSSIBAjSGReOegeEOASpGYFqg0wh X-IPAS-Result: ArUGAIDvNVNFxKjo/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCws0EhQYDSSIBAjSGReOegeEOASpGYFqg0wh X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="91431292" Original-Received: from 69-196-168-232.dsl.teksavvy.com (HELO pastel.home) ([69.196.168.232]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Oct 2014 13:44:32 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 7FE734821; Wed, 1 Oct 2014 13:44:32 -0400 (EDT) In-Reply-To: <83tx3nkfy3.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 01 Oct 2014 17:44:20 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:174914 Archived-At: > It strikes me that the VCS could merge all the commits up to the one I > want to cherry-pick, and then revert all the rest. But I guess there > are complications with this strategy, or else it would have been > implemented already. The problem is not only how to perform the merge, but how to *remember* it. I.e. so that next time you merge from emacs-24, it will know that it needs to merge all the changes except for the ones that were already cherry-picked. BTW, It gets interesting pretty quickly: - Say I have a local branch `Stef'. - `Stef' generally tracks `trunk'. - I cherry-pick into `Stef' revision 57 and 93 from `emacs-24'. - Someone merges `emacs-24' into `trunk'. I.e. commit 187 from `trunk' is a "merge commit" that merges all changes from `emacs-24' upto revision 98. - Now I want to update `Stef' by merging the latest `trunk' (which is now at revision 192) into it. Should commit 187 be merged as well? The answer is "yes but no": - yes, because it brings changes from `emacs-24' which we don't yet have. - no, because it would bring changes from `emacs-24' which we already applied. So it could try to "take revision 192, try to reverse the changes from revisions 57 and 93" and then apply the result to `Stef', but as you can see. Stefan