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: trunk r115472: Make 'configure' work out-of-the-box on Solaris. Date: Sat, 14 Dec 2013 14:03:02 +0200 Message-ID: <83ob4jfxmx.fsf@gnu.org> References: <52A941D3.4020607@cs.ucla.edu> <52A98D60.9080709@gmx.at> <83d2l26npp.fsf@gnu.org> <52A9FC38.9010603@gmx.at> <87bo0l1p2y.fsf@uwakimon.sk.tsukuba.ac.jp> <52AADDE2.7080509@gmx.at> <83k3f958b7.fsf@gnu.org> <52AC3F99.8020100@gmx.at> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1387022624 16216 80.91.229.3 (14 Dec 2013 12:03:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Dec 2013 12:03:44 +0000 (UTC) Cc: stephen@xemacs.org, eggert@cs.ucla.edu, emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 14 13:03:49 2013 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 1Vrnwj-00086W-1y for ged-emacs-devel@m.gmane.org; Sat, 14 Dec 2013 13:03:49 +0100 Original-Received: from localhost ([::1]:46930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vrnwi-0003q4-LE for ged-emacs-devel@m.gmane.org; Sat, 14 Dec 2013 07:03:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vrnwb-0003pt-U7 for emacs-devel@gnu.org; Sat, 14 Dec 2013 07:03:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrnwX-00017H-D1 for emacs-devel@gnu.org; Sat, 14 Dec 2013 07:03:41 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:64723) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrnwX-000179-4b for emacs-devel@gnu.org; Sat, 14 Dec 2013 07:03:37 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MXS00000OMH9V00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 14 Dec 2013 14:02:59 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MXS000QPPGY6L70@a-mtaout22.012.net.il>; Sat, 14 Dec 2013 14:02:59 +0200 (IST) In-reply-to: <52AC3F99.8020100@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.172 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:166384 Archived-At: > Date: Sat, 14 Dec 2013 12:23:05 +0100 > From: martin rudalics > CC: stephen@xemacs.org, eggert@cs.ucla.edu, emacs-devel@gnu.org > > > But I disagree with Stephen about the PITA part: normally, when I make > > a different build, I do that because I need to debug it or test some > > changes specific to that build. Having a separate branch for that > > from the get-go makes it very easy to make changes without thinking > > twice, and also to merge those changes later onto the trunk. > > The problem with a separate branch is that I continuously have to > resolve conflicts, sometimes over a longer period. I currently do that > for four branches already and it's getting tedious. If you have the same changes in each of the branches, then indeed separate build directories is what you want.