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 commit/push and VC Date: Thu, 20 Nov 2014 22:59:07 +0200 Message-ID: <83fvdd612c.fsf@gnu.org> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416517175 4139 80.91.229.3 (20 Nov 2014 20:59:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 20:59:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 21:59:27 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 1XrYp3-0005BP-6I for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 21:59:25 +0100 Original-Received: from localhost ([::1]:37332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrYp1-00024t-Bx for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 15:59:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrYos-00024d-Vz for emacs-devel@gnu.org; Thu, 20 Nov 2014 15:59:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrYon-0004s8-4z for emacs-devel@gnu.org; Thu, 20 Nov 2014 15:59:14 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:48314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrYom-0004rv-U7 for emacs-devel@gnu.org; Thu, 20 Nov 2014 15:59:09 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NFC00L00UQ10J00@mtaout27.012.net.il> for emacs-devel@gnu.org; Thu, 20 Nov 2014 22:54:31 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFC00DUEVEVIY80@mtaout27.012.net.il>; Thu, 20 Nov 2014 22:54:31 +0200 (IST) In-reply-to: <87ppchd9dk.fsf@Gertrud.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 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:177895 Archived-At: > From: Achim Gratz > Date: Thu, 20 Nov 2014 19:17:43 +0100 Thanks for your comments. A few responses below. > > . do we want to explicitly recommend 2 different clones, one each > > for master and the release branch? there's nothing in the > > instructions about this, or about working with 2 divergent > > branches in general > > I've just got a new computer and it takes all of 0.6 seconds to switch > from master to emacs-24. I've had a much slower one until two days ago > and I don't think it took longer than about 5 seconds even there. You are missing the point. Switching the branch is easy, but after that, you'd almost always need a full bootstrap, which might become annoying. > Unless you're really working all the time in parallel on both branches > I'd say this setup is more trouble than it's worth. I personally am working on both branches in parallel, yes. Many others do, too. Bugfixes go to one branch, new features to the other, people report bugs on this or other, etc. Bootstrapping each time, which takes a couple of minutes, is annoying. And then you sometimes want to compare what the two binaries, one from master, the other from the release branch, do in the same situation. But that's me, and I already know how to solve this. I'm asking what, if anything, do we want to recommend. > > . GitQuickStartForEmacsDevs advises to use "git ci -a"; why not > > suggest the same in GitForEmacsDevs? it seems a simpler setup > > That is no git command. Assuming that ci is an alias for commit, then > no, that is not a good recommendation in general. If the only changes > you have belong to a single commit (a quick bugfix, say) then it saves a > bit of typing. But if the changes should really be goign to different > commits for clarity, then this is ill-advised. We are talking about simplified instructions here, mind you. Don't take that as a general advice for advanced users: they don't need these instructions.