From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sat, 15 Nov 2014 17:34:06 +0100 Message-ID: <87ppcowhhd.fsf@engster.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <838ujcfn1i.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416069274 1287 80.91.229.3 (15 Nov 2014 16:34:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 16:34:34 +0000 (UTC) Cc: esr@thyrsus.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 17:34:28 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 1XpgIs-0002qF-C5 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 17:34:26 +0100 Original-Received: from localhost ([::1]:41049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgIr-0002hB-Vi for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 11:34:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgIh-0002Y3-TY for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:34:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpgIb-0005qd-SM for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:34:15 -0500 Original-Received: from randomsample.de ([5.45.97.173]:33809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgIb-0005qY-M2; Sat, 15 Nov 2014 11:34:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=G8gLn5s9Lz5M9tqi+WYGA8s85eIhVvUBcibd1xWvmm8=; b=CdOJLnRg5BJsrV2PEqZTz5j1hIdIWlq+rtZmLCvifY9kKNPLu/DcJyzbR95TxYBgu3z2dtDQmD0TL1AIIdiZ5mVpGfqIKGlXPrgI6bje5sRZHeTHRjFFcUiF665NsdAX; Original-Received: from ip2504b377.dynamic.kabel-deutschland.de ([37.4.179.119] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XpgIa-0008BH-EM; Sat, 15 Nov 2014 17:34:08 +0100 In-Reply-To: <838ujcfn1i.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 18:26:01 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:177202 Archived-At: Eli Zaretskii writes: >> From: David Engster >> 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. > > You mean, if I merge a commit, and then make another commit that > undoes all the changes of the first one, that first commit will not > appear in the DAG? I'd be surprised. > > Or are you saying that if I do the above, then merge again from the > same branch, Git will again bring the same stuff and effectively undo > my undo? No. Explicitly reverting the commit is one possibility that works, but that's ugly and tedious, especially when the commit has conflicts (which is pretty common, since this is often the reason why it should be skipped in the first place). With Bazaar, you could gradually build up your merge in a series of smaller merges using different strategies (granted, that involved using the '--force' option, but nonetheless, it was possible). In the end, this lead to one single merge commit from the emacs-24 branch, which was nice and tidy. I was hoping one of the git experts around here could tell me how to do that with git. -David