From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.devel Subject: Re: need help adjusting workflow to git (or vice versa) Date: Thu, 13 Nov 2014 20:51:03 +0100 Message-ID: <87oasaubfc.fsf@rosalinde.fritz.box> References: <87zjbvt8o3.fsf@rosalinde.fritz.box> <5464DC5F.8070607@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415908315 3210 80.91.229.3 (13 Nov 2014 19:51:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 19:51:55 +0000 (UTC) Cc: martin rudalics , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 20:51:49 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 1Xp0Qd-0003Qp-Ud for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 20:51:40 +0100 Original-Received: from localhost ([::1]:33670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp0Qd-0006gD-Ka for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 14:51:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp0QI-0006Xm-UF for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:51:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp0QE-0001OA-5f for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:51:18 -0500 Original-Received: from mout.gmx.net ([212.227.15.15]:56722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp0QD-0001Ms-S9 for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:51:14 -0500 Original-Received: from rosalinde.fritz.box ([89.245.82.172]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0MCcvy-1Xgmwc1HG6-009My7; Thu, 13 Nov 2014 20:51:12 +0100 In-Reply-To: (Andreas Schwab's message of "Thu, 13 Nov 2014 17:43:27 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:YqrAevNfluOAKDkhoVJMZhOhVpktGsxLJPtYM9VfH60XnOw0YxB UmFmXVsvpw5RLelqzkvwLndBHWkUZ68l8ugRdEQUXhRS5y6yPxfynRCQTmVvelswp+ilMgL afP7QSHOhUkyMzOQT+z6YMVSJzkV34uloeyyzBoiC7cvqAB0Ou/ClNdX/3Jfr2Bnh3Ab+qN GM9ps8aL78L4KIi9zIGRQ== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.15 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:176998 Archived-At: On Thu, 13 Nov 2014 17:43:27 +0100 Andreas Schwab wrote: > martin rudalics writes: > >>> So how can I (i) keep a >>> pristine copy of trunk (master) and (ii) build with possibly some local >>> changes but without all changes from the task branch? >> >> From what I understand from here >> >> http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00790.html >> >> and subsequent comments you have to make a spearate clone. > > You can also use git new-workdir (not yet part of the git core, a proper > replacement is being worked on). I would be very surprised if either of these approaches is used by most developers using git, because if so, I'd have expected them to be part of the standard toolkit and well documented. So I think my workflow is suboptimal for git. What do people who have several branches of a single project repository and want to build from one of them without including changes from another in the build usually do? Isn't that a common scenario, especially for Emacs developers? What do you people do? Steve Berman