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: State of the repository conversion Date: Fri, 21 Mar 2014 11:08:06 +0200 Message-ID: <83ob0z6hs9.fsf@gnu.org> References: <20140319175124.BCCB3380835@snark.thyrsus.com> <87bnx1ricb.fsf@igel.home> <83ob118r76.fsf@gnu.org> <8361n896es.fsf@gnu.org> <878us44mcs.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1395392877 6915 80.91.229.3 (21 Mar 2014 09:07:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Mar 2014 09:07:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 21 10:08:06 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 1WQvQr-0005pb-Sf for ged-emacs-devel@m.gmane.org; Fri, 21 Mar 2014 10:08:06 +0100 Original-Received: from localhost ([::1]:51443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQvQr-0003nO-DC for ged-emacs-devel@m.gmane.org; Fri, 21 Mar 2014 05:08:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQvQj-0003mx-Mx for emacs-devel@gnu.org; Fri, 21 Mar 2014 05:08:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQvQe-0002ez-Cp for emacs-devel@gnu.org; Fri, 21 Mar 2014 05:07:57 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:33145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQvQe-0002ep-4U for emacs-devel@gnu.org; Fri, 21 Mar 2014 05:07:52 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N2S00K003MUFJ00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 21 Mar 2014 11:07:50 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N2S00KSN4124O90@a-mtaout20.012.net.il>; Fri, 21 Mar 2014 11:07:50 +0200 (IST) In-reply-to: <878us44mcs.fsf@dod.no> 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:170695 Archived-At: > From: Steinar Bang > Date: Thu, 20 Mar 2014 22:00:03 +0100 > > >>>>> Eli Zaretskii : > > > IOW, we need specific suggestions of workflows and procedures, rather > > than general references to possible ways of going about this. > > Ok, here's how to make a local, er... remote Thanks. However, I cannot easily map this arrangement to what I had in mind, namely, having a separate trunk and release branches, each one having its working tree in a different directory. What am I missing? As for feature branches, I think relatively short-lived ones will be better off in the same directory as the trunk, because they aren't expected to diverge too much, so having them co-located actually makes a lot of sense and saves time. (Since each build produces also a numbered emacs-XX.YY.nn executable, it is at least in theory possible to have several executables available at once.) By contrast, feature branches that make deep changes and this diverge a lot from the trunk are better kept in separate directories, like the release branch. > Downsides to a git repository backing multiple working directories, are: > - 3 copies of the git repository on disk, rather than just one Doesn't --separate-git-dir solve that problem?