From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sun, 23 Nov 2014 19:40:40 +0100 Organization: Probably a good idea 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> <87389brle1.fsf@engster.org> <83r3wtrekk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416768058 1511 80.91.229.3 (23 Nov 2014 18:40:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Nov 2014 18:40:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 23 19:40:47 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 1Xsc5W-0007FA-Er for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 19:40:46 +0100 Original-Received: from localhost ([::1]:49650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsc5W-0003XQ-18 for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 13:40:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsc5L-0003XH-JS for emacs-devel@gnu.org; Sun, 23 Nov 2014 13:40:40 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xsc5G-0003lI-9Q for emacs-devel@gnu.org; Sun, 23 Nov 2014 13:40:35 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:45902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsc5G-0003lE-39 for emacs-devel@gnu.org; Sun, 23 Nov 2014 13:40:30 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xsc5F-00073G-B0 for emacs-devel@gnu.org; Sun, 23 Nov 2014 19:40:29 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Nov 2014 19:40:29 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Nov 2014 19:40:29 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 23 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:p0T56tKhACqocU+mJoQZmXiZ2PM= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:178111 Archived-At: >>>>> Eli Zaretskii : >> >>>>> 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. I know. The bare repo referred above to is for transferring a branch between two separate clones on local disk. The bare repo is separate from the two clones named emacs24 and master. The snipped procedure shows how to create that local repository, and how to push a branch from one clone and merge it into a branch in the other clone.