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, 22 Nov 2014 18:17:16 +0100 Message-ID: <87a93jrw83.fsf@engster.org> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416676683 27831 80.91.229.3 (22 Nov 2014 17:18:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 17:18:03 +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 22 18:17:56 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 1XsEJl-00084Y-Uq for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 18:17:54 +0100 Original-Received: from localhost ([::1]:46240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsEJl-0003gp-Fd for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 12:17:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsEJP-0003Y6-Td for emacs-devel@gnu.org; Sat, 22 Nov 2014 12:17:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsEJL-0001eg-9y for emacs-devel@gnu.org; Sat, 22 Nov 2014 12:17:31 -0500 Original-Received: from randomsample.de ([5.45.97.173]:50755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsEJL-0001ZS-1B; Sat, 22 Nov 2014 12:17:27 -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=7/W5mxLNLYz5pzJsHzYgRTpsR1jV31mSFK4ZzWRZq5M=; b=O6buuhuXgJYGI2S23YX1hBHr/yA2nbkIGl62J028UqlP/ZUpHqdaHPo1bwKzOWBc333ejzN74Le4rJZXOD1AFvJChCn0HZR4pv9n/gQWK86hIL35y6BfSbxGAu1sIk/G; 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 1XsEJC-0006Du-9E; Sat, 22 Nov 2014 18:17:18 +0100 In-Reply-To: <83mw7jrxt9.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 22 Nov 2014 18:42:58 +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:178032 Archived-At: Eli Zaretskii writes: >> From: David Engster >> Cc: monnier@iro.umontreal.ca, esr@thyrsus.com, emacs-devel@gnu.org >> Date: Sat, 22 Nov 2014 17:13:29 +0100 > >> >> Eli Zaretskii writes: >> > What are the assumptions about the location of the release branch? Do >> > you assume the release branch is in the same cloned repo as master, or >> > are there provisions for having the branch in another clone? >> >> As long as you use git-new-workdir, that shouldn't matter. > > You mean, gitmerge.el will discover that and DTRT by itself? That's > way cool! > >> The 'trunk' checkout should also have a local tracking branch >> 'emacs-24'. > > I don't think it's a good idea to rely on that, because it's something > that's too easy to forget. That's a misunderstanding. The above was not meant as a requirement, but as a consequence of using git-new-workdir. If you follow admin/notes/git-workflow and create a separate checkout of the emacs-24 branch, you will automatically have a local tracking branch emacs-24 (also in 'trunk'). At least that's what I am seeing here. I don't know the inner workings of git-new-workdir, but the directories should to be the same clone, but with a different checkout. So if you call 'git branch' in 'trunk', you should see emacs-24 * master and in 'emacs-24' * emacs-24 master That's why gitmerge.el doesn't have to detect anything. It simply can do its work in 'trunk'. >> Alternatively, we could default to merge origin/emacs-24, which >> wouldn't even require a local tracking branch. > > Yes, please, let's do that. You'll be able to do either. For git it makes no difference whether you merge a local or a remote branch. -David