From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: need help adjusting workflow to git (or vice versa) Date: Fri, 14 Nov 2014 21:08:22 -0800 Organization: Newt Software Message-ID: <878ujd1261.fsf@olgas.newt.com> References: <87zjbvt8o3.fsf@rosalinde.fritz.box> <5464DC5F.8070607@gmx.at> <87oasaubfc.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416028145 22718 80.91.229.3 (15 Nov 2014 05:09:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 05:09:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 06:08:58 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 1XpVbU-00073l-LR for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 06:08:56 +0100 Original-Received: from localhost ([::1]:38703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpVbU-0003w1-4u for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 00:08:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpVbE-0003vv-R4 for emacs-devel@gnu.org; Sat, 15 Nov 2014 00:08:45 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpVbA-0001du-Dy for emacs-devel@gnu.org; Sat, 15 Nov 2014 00:08:40 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:55690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpVbA-0001dp-6w for emacs-devel@gnu.org; Sat, 15 Nov 2014 00:08:36 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XpVb6-0006wz-QF for emacs-devel@gnu.org; Sat, 15 Nov 2014 06:08:32 +0100 Original-Received: from c-24-6-53-16.hsd1.ca.comcast.net ([24.6.53.16]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 15 Nov 2014 06:08:32 +0100 Original-Received: from wohler by c-24-6-53-16.hsd1.ca.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 15 Nov 2014 06:08:32 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 41 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-24-6-53-16.hsd1.ca.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.93 (gnu/linux) Cancel-Lock: sha1:jQ8LW+vyW2bbUZXo/rmnkuaHWV0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177136 Archived-At: Stephen Berman writes: > 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? I usually just "git co " since it's very fast. If I have outstanding changes, I either first check them into a temporary branch (cheap), or use git stash. If I need to have the two versions visible at the same time, I'll either clone the repository in another directory as suggested, or simply copy my git directory to another. Note that either of these are a great idea when experimenting with new git functionality. If you mess up, just delete the copy/clone. -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD