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: Git transition checklist Date: Thu, 09 Jan 2014 18:58:46 +0200 Message-ID: <831u0hdrcp.fsf@gnu.org> References: <20140108135200.8ECF9380834@snark.thyrsus.com> <1738kywelh.fsf@fencepost.gnu.org> <20140108200216.GB5374@thyrsus.com> <6pr48h52eq.fsf@fencepost.gnu.org> <87y52pg4ov.fsf@uwakimon.sk.tsukuba.ac.jp> <838uupeitt.fsf@gnu.org> <87sisxfu6q.fsf@uwakimon.sk.tsukuba.ac.jp> <87txddmmcj.fsf@igel.home> <87lhypfcs4.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1389286746 23950 80.91.229.3 (9 Jan 2014 16:59:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 9 Jan 2014 16:59:06 +0000 (UTC) Cc: esr@thyrsus.com, schwab@linux-m68k.org, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 09 17:59:12 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 1W1Iwh-0008O0-Fi for ged-emacs-devel@m.gmane.org; Thu, 09 Jan 2014 17:59:03 +0100 Original-Received: from localhost ([::1]:52979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1Iwh-0002PQ-5S for ged-emacs-devel@m.gmane.org; Thu, 09 Jan 2014 11:59:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1IwZ-0002Hs-Tl for emacs-devel@gnu.org; Thu, 09 Jan 2014 11:59:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W1IwU-0004XF-T7 for emacs-devel@gnu.org; Thu, 09 Jan 2014 11:58:55 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:45013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1IwU-0004X1-LT for emacs-devel@gnu.org; Thu, 09 Jan 2014 11:58:50 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0MZ5007008I1N100@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Thu, 09 Jan 2014 18:58:49 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZ5007NS8I0M310@a-mtaout23.012.net.il>; Thu, 09 Jan 2014 18:58:49 +0200 (IST) In-reply-to: <87lhypfcs4.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:167936 Archived-At: > From: "Stephen J. Turnbull" > Cc: esr@thyrsus.com, > Eli Zaretskii , > emacs-devel@gnu.org > Date: Thu, 09 Jan 2014 23:30:35 +0900 > > On balance, I guess it is better to avoid the --shared option. I guess we have a consensus, then. I think Stefan also suggested separate repositories. So would someone "in the know" please update the Wiki with the instructions how to set this up and what the workflow would look like for working on the trunk and a release branch in this way? The main jobs to be covered are, I think, (a) updating each branch from upstream and (b) merging and/or cherry-picking commits between the two branches each one of which is in a separate repository. TIA. > Except: what about Windows filesystems? I have no idea if they > implement hardlinks properly Hard links are supported on NTFS. I didn't yet try cloning locally though, so I don't know whether there are Windows-specific problems here. > (I gather the semantics of symlinks are somewhat different). The semantics of symlinks are almost identical, but creating a symlink is a privileged operation on Windows, so use of symlinks is not a good idea. Btw, I think git can use something called "alternates" instead of hard links? Is this relevant? > > Copying commits between clones is straight forward with git fetch. > > True but I doubt Glenn and Eli are worried about that. ??? Merges and cherry-picks between the release branch and the trunk happen all the time, as long as the release branch is active. Btw, one other task that should be accomplished before the switch is how and what will we merge between the two branches. We use admin/bzrmerge.el with bzr, and the way that works allows to make a release branch from the trunk by merging. The corresponding gitmerge.el, if it is needed, or procedures that will replace it if not, should probably allow similar capabilities.