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: Sun, 23 Nov 2014 19:50:51 +0200 Message-ID: <83r3wtrekk.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> <83mw7jrxt9.fsf@gnu.org> <87a93jrw83.fsf@engster.org> <83ioi7rn9o.fsf@gnu.org> <87389brle1.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416765082 12868 80.91.229.3 (23 Nov 2014 17:51:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Nov 2014 17:51:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 23 18:51:14 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 1XsbJa-0005fW-7R for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 18:51:14 +0100 Original-Received: from localhost ([::1]:49531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsbJZ-0000Kh-Nj for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 12:51:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsbJE-0008SQ-Fu for emacs-devel@gnu.org; Sun, 23 Nov 2014 12:50:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsbJ8-0005xZ-TY for emacs-devel@gnu.org; Sun, 23 Nov 2014 12:50:52 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:49246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsbJ7-0005sV-ST for emacs-devel@gnu.org; Sun, 23 Nov 2014 12:50:46 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NFI00A006UPW300@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sun, 23 Nov 2014 19:50:44 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFI00A3Y6WJN230@a-mtaout20.012.net.il>; Sun, 23 Nov 2014 19:50:44 +0200 (IST) In-reply-to: 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:178106 Archived-At: > From: Steinar Bang > Date: Sun, 23 Nov 2014 17:32:57 +0100 > > >>>>> David Engster : > > > It will always be able to merge origin/emacs-24. I guess you could set > > things up to merge from a second, separate clone (by adding it as a > > remote), but I don't see the need. > > You don't need a clone for this, just a local bare repo. The clone is needed to actually work on the release branch, without having to bootstrap it each time you "git checkout" it.