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: Rewriting bzrmerge.el Date: Sat, 15 Nov 2014 11:04:06 -0500 Message-ID: References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416067482 6392 80.91.229.3 (15 Nov 2014 16:04:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 16:04:42 +0000 (UTC) Cc: emacs-devel@gnu.org To: esr@thyrsus.com (Eric S. Raymond) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 17:04:35 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 1Xpfpy-0002bE-Ok for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 17:04:34 +0100 Original-Received: from localhost ([::1]:40944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpfpx-0000IB-UB for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 11:04:33 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpfpf-0000H0-1Q for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:04:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpfpX-0004OR-IN for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:04:14 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:50025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpfpX-0004OJ-E5 for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:04:07 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsUIAGA2ZVRLd+sd/2dsb2JhbABRCoMOimLLDAQCAoEcFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNiG8J0QQBAQEHAQEBAR6QOFwHhEsFjAunF4F2hBofgnsBAQE X-IPAS-Result: AsUIAGA2ZVRLd+sd/2dsb2JhbABRCoMOimLLDAQCAoEcFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNiG8J0QQBAQEHAQEBAR6QOFwHhEsFjAunF4F2hBofgnsBAQE X-IronPort-AV: E=Sophos;i="5.07,380,1413259200"; d="scan'208";a="97087993" Original-Received: from 75-119-235-29.dsl.teksavvy.com (HELO pastel.home) ([75.119.235.29]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 15 Nov 2014 11:04:06 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id ABC0285E5; Sat, 15 Nov 2014 11:04:06 -0500 (EST) In-Reply-To: <87bno8y0rt.fsf_-_@engster.org> (David Engster's message of "Sat, 15 Nov 2014 15:52:06 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.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:177192 Archived-At: > So, with bzr, we could pretty easily commit only the meta-data of > skipped commits, so that they were regarded as merged. But being the > stupid content tracker that Git is, I think that ship has sailed. AFAICT, there is no difference between Git and Bzr in this respect. > We can of course cherry-pick a commit with the 'ours' merge strategy, > but that will of course change the SHA1... bzrmerge.el does not cherry-pick and neither should gitmerge.el. It should identify those commits that are "backports" (or similar) and merge them with the `ours' strategy (which will indeed leave the files unchanged while affecting the metadata, AFAIK). Stefan