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: Fri, 21 Nov 2014 11:06:26 +0200 Message-ID: <83mw7k53e5.fsf@gnu.org> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> <83fvdd612c.fsf@gnu.org> <546EF69B.20303@gmx.at> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416560811 30662 80.91.229.3 (21 Nov 2014 09:06:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Nov 2014 09:06:51 +0000 (UTC) Cc: Stromeko@nexgo.de, emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 21 10:06:44 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 1XrkAt-0004WE-5Z for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 10:06:43 +0100 Original-Received: from localhost ([::1]:39303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrkAs-0007gW-Lz for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2014 04:06:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrkAk-0007gM-8y for emacs-devel@gnu.org; Fri, 21 Nov 2014 04:06:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrkAe-0004JI-Uj for emacs-devel@gnu.org; Fri, 21 Nov 2014 04:06:34 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:38325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrkAe-0004JB-Mv for emacs-devel@gnu.org; Fri, 21 Nov 2014 04:06:28 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NFD00G00SOXXV00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Fri, 21 Nov 2014 11:06:27 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFD00GZGTARR790@a-mtaout23.012.net.il>; Fri, 21 Nov 2014 11:06:27 +0200 (IST) In-reply-to: <546EF69B.20303@gmx.at> 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:177923 Archived-At: > Date: Fri, 21 Nov 2014 09:23:55 +0100 > From: martin rudalics > CC: emacs-devel@gnu.org > > > 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. > > A bootstrap takes more than half an hour on my machines. Are you using "make -jN"? If not, I highly recommend trying that. On a Core i7 system, "make -j6" (if you have XP) or "make -j8" (Windows 7 and later) can work wonders on your build time. > Having touched one C header file means that rebuilding takes almost > 10 minutes here. That's strange: compiling C sources is very fast, most of the bootstrap time is spent compiling Lisp. What kind of CPU do you have there? > > 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. > > This is my workflow as well. Which doesn't exclude that git's branching > concept might be useful even here. Sometimes, at least. Of course, it's useful: for branches that don't diverge too much from the branch you fork off, like feature branches, for example. > Among others, the switch to MSYS has made building on Windows slow down > by a factor of two here (at least that's the impression I get). If "make -jN" is not speedy enough, consider replacing your work disk with an SSD. The build will fly. > I doubt that all Emacs users have suitable hardware that makes > switching between master and Emacs-24 a feasible operation in one > and the same clone. For those who need to do that frequently, I agree.