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, 22 Nov 2014 17:28:59 -0500 Message-ID: References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <871tp4xx4i.fsf@engster.org> <87tx20whtq.fsf@engster.org> <87lhn4rx0v.fsf@engster.org> <838uj3tztm.fsf@gnu.org> <87egsvrz6e.fsf@engster.org> <83mw7jrxt9.fsf@gnu.org> <87a93jrw83.fsf@engster.org> <83ioi7rn9o.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416695373 30489 80.91.229.3 (22 Nov 2014 22:29:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 22:29:33 +0000 (UTC) Cc: esr@thyrsus.com, David Engster , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 23:29:26 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 1XsJBB-0002fi-Rt for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 23:29:22 +0100 Original-Received: from localhost ([::1]:46966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsJBB-0004ef-EY for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 17:29:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsJB1-0004eX-BF for emacs-devel@gnu.org; Sat, 22 Nov 2014 17:29:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsJAt-0001oA-Qw for emacs-devel@gnu.org; Sat, 22 Nov 2014 17:29:11 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:32860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsJAt-0001o6-Mh; Sat, 22 Nov 2014 17:29:03 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sAMMT0ZM011646; Sat, 22 Nov 2014 17:29:00 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id D504643AC; Sat, 22 Nov 2014 17:28:59 -0500 (EST) In-Reply-To: <83ioi7rn9o.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 22 Nov 2014 22:30:43 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5133=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5133> : inlines <1554> : streams <1346973> : uri <1835741> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:178040 Archived-At: > AFAIU, not if there's no checkout of emacs-24 there. "git merge" (and I assume gitmerge.el) doesn't require a checkout of the branch which you're trying to merge. It just needs to be in the repository, which it usually will in the case of merging emacs-24 to master since they both come from the same repository, so you'd have to do a "clone" that only fetches "master" in order not to have emacs-24. Stefan