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 17:13:29 +0100 Message-ID: <87egsvrz6e.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416672840 24937 80.91.229.3 (22 Nov 2014 16:14:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 16:14:00 +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 17:13:54 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 1XsDJq-0005ZQ-42 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 17:13:54 +0100 Original-Received: from localhost ([::1]:45896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsDJp-0006WX-Kv for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 11:13:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsDJg-0006T1-Gj for emacs-devel@gnu.org; Sat, 22 Nov 2014 11:13:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsDJa-0008Uk-DZ for emacs-devel@gnu.org; Sat, 22 Nov 2014 11:13:44 -0500 Original-Received: from randomsample.de ([5.45.97.173]:50681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsDJa-0008UR-5E; Sat, 22 Nov 2014 11:13:38 -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=kH8kQWXGDI/1Hu20bb5GI/VmuTN7fn9Uj1QfBquYRlg=; b=DMAovRHg2r+2c3L8g5qbJkYx2fJNkrJViyUaOKa37yNslV4I9ovTD3S+noaVKP6BkdnW8y+BdH3BB+FkS0r0jiPthsk2nvXwvUhh54mOlPjHbeEkrUG6N2y7+0KZONTE; 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 1XsDJW-0005ce-Hf; Sat, 22 Nov 2014 17:13:34 +0100 In-Reply-To: <838uj3tztm.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 22 Nov 2014 10:16:37 +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:178021 Archived-At: 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. The 'trunk' checkout should also have a local tracking branch 'emacs-24'. Alternatively, we could default to merge origin/emacs-24, which wouldn't even require a local tracking branch. -David