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:50:50 +0100 Message-ID: <87ppcqubfp.fsf@rosalinde.fritz.box> References: <87zjbvt8o3.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415908299 2927 80.91.229.3 (13 Nov 2014 19:51:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 19:51:39 +0000 (UTC) Cc: Emacs development discussions To: Kelvin White Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 20:51:32 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 1Xp0QU-0003Kb-GH for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 20:51:30 +0100 Original-Received: from localhost ([::1]:33669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp0QU-0006Wg-1L for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 14:51:30 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp0QA-0006Wa-U3 for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:51:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp0Q4-0001Kg-WF for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:51:10 -0500 Original-Received: from mout.gmx.net ([212.227.15.15]:52196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp0Pu-0001IF-R7; Thu, 13 Nov 2014 14:50:55 -0500 Original-Received: from rosalinde.fritz.box ([89.245.82.172]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0M70Td-1Y9r7B2url-00woQi; Thu, 13 Nov 2014 20:50:52 +0100 In-Reply-To: (Kelvin White's message of "Thu, 13 Nov 2014 10:49:05 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:7JVR0yVdNBRDzMPtkmLLpd8jmatccQJqyoTzLQT6oQHsoLUlW+r eHo4AwhoMKrtFv/F4KSS4eH5ZVuWuKSx5tiQEiERk7Oz3KXV1dzQu/yhYPhp1F5AmdXdvL5 RsVTrrbeDN7wJLaHjaHQhj3OcRRAgfk6u0A6TPPIiAKYXpDO/3oVY3rebJ8aMSRZbU/bSrn v2mSgcEsSBce1YxWC7ZGg== 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:176997 Archived-At: On Thu, 13 Nov 2014 10:49:05 -0500 Kelvin White wrote: > Stephen Berman wrote: >> I'm learning how to use git and am still stumbling over basic things. >> With bzr I had a shared repository of Emacs sources, containing several >> branches, including a mirror of trunk that I only updated, and a branch >> that I did my regular builds from, which I pulled from the trunk mirror >> but occasionally made small changes to, which went into my builds. I >> also had a task branch for longer term development, and occasionally >> copied or merged changes from there to the build branch. All of these >> branches had there own source files, which weren't touched by changes in >> the other branches (unless I merged or copied over changes). Now I've >> cloned the new git repository from Savannah and followed the >> instructions on the Emacs Wiki to make a task branch. But there is >> still only one set of sources. I do see the task branch and can check >> it out, but when I added my changes from the corresponding bzr task >> branch and then checked out master again, it shows the (still >> uncommitted) changes. I also made a build branch but when I check it >> out, it likewise shows the uncommitted changes from the task branch, so >> if I now do make, the changes from my task branch will AFAICT be >> included in the build, which I don't want. 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? > > The uncommitted changes will not be included unless you add them and > commit them. But they are included in the build (I confirmed this by building from my build branch, not from task branch (i.e., with my build branch currently checked out), and that's what I want to avoid. Steve Berman