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: Fri, 21 Nov 2014 23:47:44 +0100 Message-ID: <87lhn4rx0v.fsf@engster.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <871tp4xx4i.fsf@engster.org> <87tx20whtq.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416610095 27220 80.91.229.3 (21 Nov 2014 22:48:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Nov 2014 22:48:15 +0000 (UTC) Cc: "Eric S. Raymond" , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 21 23:48:09 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 1Xrwzo-0002oL-IF for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 23:48:08 +0100 Original-Received: from localhost ([::1]:42745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrwzo-00029M-6L for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 17:48:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrwzf-00027w-De for emacs-devel@gnu.org; Fri, 21 Nov 2014 17:48:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrwzZ-0004mW-7d for emacs-devel@gnu.org; Fri, 21 Nov 2014 17:47:59 -0500 Original-Received: from randomsample.de ([5.45.97.173]:49994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrwzY-0004mA-V9 for emacs-devel@gnu.org; Fri, 21 Nov 2014 17:47:53 -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=fBkkSle4QgPZNJuVAjs79nlk7g0BFDIvPYkC6Yow6HE=; b=GOIoi1AwFx0jWPPtwOh+odg0xHs/Nmi3/rr+fcnyfJEQ5V4U3B4lRpqjd/8jUuq6dYF60sVdfrNsvfQ1ZV/XzAw8G7uXhvy+TH+qROsYL82zc+7kjgdtjoBg/BEyTDoK; Original-Received: from ip4d154d80.dynamic.kabel-deutschland.de ([77.21.77.128] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XrwzV-0004VC-Dp; Fri, 21 Nov 2014 23:47:49 +0100 In-Reply-To: (Stefan Monnier's message of "Sat, 15 Nov 2014 22:50:59 -0500") 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:177962 Archived-At: Stefan Monnier writes: >> On second thought: Do you mean we should just merge them in a series of >> merge commits (maybe in a temporary branch as to not pollute 'master' >> too much)? That's easy, of course. I was hoping I could somehow >> replicate the workflow we did with Bazaar, where we had one single merge >> commit for each merge. > > It doesn't matter if it's a single commit or not. OK, I've done the rewrite but I need to clean it up a bit, which I'll do over the weekend. I've also found that I can actually squash the merges into one with a little bit of plumbing: simply do a soft reset before the merges, then do a 'commit-tree' and set the second parent to the last commit from emacs-24 you have in your last merge. That seems to work fine since all the commits in the consecutive merges are directly related, but I'm not really comfortable with it just yet, so I'll keep that for later... -David