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: need help adjusting workflow to git (or vice versa) Date: Thu, 13 Nov 2014 16:35:56 +0100 Message-ID: <87zjbvt8o3.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415892997 11506 80.91.229.3 (13 Nov 2014 15:36:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 15:36:37 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 16:36:29 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 1XowRg-0005eM-DE for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 16:36:28 +0100 Original-Received: from localhost ([::1]:60540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowRg-0002Aa-1i for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 10:36:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowRV-00029T-0A for emacs-devel@gnu.org; Thu, 13 Nov 2014 10:36:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XowRN-0006Cz-HN for emacs-devel@gnu.org; Thu, 13 Nov 2014 10:36:16 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:60089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowRN-0006Cv-BC for emacs-devel@gnu.org; Thu, 13 Nov 2014 10:36:09 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XowRM-0005SS-2t for emacs-devel@gnu.org; Thu, 13 Nov 2014 16:36:08 +0100 Original-Received: from i59f552ac.versanet.de ([89.245.82.172]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Nov 2014 16:36:08 +0100 Original-Received: from stephen.berman by i59f552ac.versanet.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Nov 2014 16:36:08 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: i59f552ac.versanet.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) 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:176923 Archived-At: 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? Steve Berman