From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sun, 23 Nov 2014 17:29:38 +0100 Organization: Linux Private Site Message-ID: <873899swwd.fsf@Gertrud.fritz.box> 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> <87oarysr3u.fsf@uwakimon.sk.tsukuba.ac.jp> <87siha5oru.fsf@fencepost.gnu.org> <83bnnxsxve.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416760213 32618 80.91.229.3 (23 Nov 2014 16:30:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Nov 2014 16:30:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 23 17:30:07 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 1Xsa35-00004v-3e for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 17:30:07 +0100 Original-Received: from localhost ([::1]:49178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsa34-0002ur-GX for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 11:30:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsa2v-0002qd-Nw for emacs-devel@gnu.org; Sun, 23 Nov 2014 11:30:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xsa2q-00031e-9f for emacs-devel@gnu.org; Sun, 23 Nov 2014 11:29:57 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:40545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsa2q-00031R-2O for emacs-devel@gnu.org; Sun, 23 Nov 2014 11:29:52 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xsa2o-0008LB-9l for emacs-devel@gnu.org; Sun, 23 Nov 2014 17:29:50 +0100 Original-Received: from pd9eb0fdb.dip0.t-ipconnect.de ([217.235.15.219]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Nov 2014 17:29:50 +0100 Original-Received: from Stromeko by pd9eb0fdb.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 23 Nov 2014 17:29:50 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 38 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb0fdb.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:iTt8yVD5M7+dD5urTbb8SHlbGCk= 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:178090 Archived-At: Eli Zaretskii writes: >> "Download the repository twice" seems uncalled for. One can always use >> >> git clone --mirror >> >> to create the second clone. > > But I thought the discussion demonstrated that this command alone does > not guarantee the second clone will have all the branches. Did I > misunderstand? It does... But it creates a bare repository, which you then have to move into the "emacs-24" directory as .git/ or provide a gitlink file that points to it. Again, the easiest way to clone the repo twice is to do exactly that and have the second clone use the first as a reference repository. A more symmetric setup is to do the first clone into a bare repository and then clone both working repos with reference to the first one: git clone --bare git://git.sv.gnu.org/emacs.git git clone --reference emacs.git --branch master master git clone --reference emacs.git --branch emacs-24 emacs-24 If you remember to always do a "git remote update" first for the bare repository before pulling in the work trees, you'll never copy any object from the official repo more than once. This also scales nicely to even more repositories as long as you really keep a strict "one repo per branch" workflow. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf rackAttack V1.04R1: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada