From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sat, 22 Nov 2014 18:42:58 +0200 Message-ID: <83mw7jrxt9.fsf@gnu.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416674605 21631 80.91.229.3 (22 Nov 2014 16:43:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 16:43:25 +0000 (UTC) Cc: esr@thyrsus.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 17:43:16 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 1XsDmG-0000x7-3F for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 17:43:16 +0100 Original-Received: from localhost ([::1]:45964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsDmF-0000rT-Oi for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 11:43:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsDm0-0000pQ-Ge for emacs-devel@gnu.org; Sat, 22 Nov 2014 11:43:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsDlv-0000bq-RE for emacs-devel@gnu.org; Sat, 22 Nov 2014 11:43:00 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:57086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsDlv-0000be-IY for emacs-devel@gnu.org; Sat, 22 Nov 2014 11:42:55 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NFG00K0090D2000@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 22 Nov 2014 18:42:53 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFG00JSH93HHG90@a-mtaout20.012.net.il>; Sat, 22 Nov 2014 18:42:53 +0200 (IST) In-reply-to: <87egsvrz6e.fsf@engster.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:178028 Archived-At: > 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. > Alternatively, we could default to merge origin/emacs-24, which > wouldn't even require a local tracking branch. Yes, please, let's do that. Thanks.