From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelvin White Newsgroups: gmane.emacs.devel Subject: Re: need help adjusting workflow to git (or vice versa) Date: Thu, 13 Nov 2014 10:49:05 -0500 Message-ID: References: <87zjbvt8o3.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1415893908 28714 80.91.229.3 (13 Nov 2014 15:51:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 15:51:48 +0000 (UTC) Cc: Emacs development discussions To: Stephen Berman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 16:51:41 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 1XowgO-0006T1-J8 for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 16:51:40 +0100 Original-Received: from localhost ([::1]:60664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowgO-0005es-5Z for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 10:51:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xowdw-0002Px-5w for emacs-devel@gnu.org; Thu, 13 Nov 2014 10:49:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xowdv-0002Gg-6c for emacs-devel@gnu.org; Thu, 13 Nov 2014 10:49:08 -0500 Original-Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]:44842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xowdv-0002GR-08 for emacs-devel@gnu.org; Thu, 13 Nov 2014 10:49:07 -0500 Original-Received: by mail-wg0-f42.google.com with SMTP id y19so1769864wgg.15 for ; Thu, 13 Nov 2014 07:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=bUr3cKwD7GYGHE/cB3DlvtILCug3lUmSuSpoir2MXes=; b=hfcoFqsQbkSWsLFLkwDGykTY25NJ0d9ogHecsVKR4EXMjkK8lc2m8MG0V9BFhZnFho MYShbf+3WwEt90iJYtCYNws+2iVIeCHFrvBIpj1k+0bBssmZF2PHOKACuet/+wlX8fR4 QP3RmGg3OsYJsKOVgS4yToQH0EAu/RiR3/bRRVUNhnCegIs4WQiyQxFozZZDXTeKMRJT GnR6n6u0032CS1o1uJhrqVOEPi71WWihydywRUkOsWYIzQCz5oJP+t3fMKTeT0sSy3ys gpX7FDWnCgHKAL7lDUlYZfwABZP5HJQzFRfGo0WFHLJPuUF8wk2nAtRDjvnp1/o++fHw WBXg== X-Received: by 10.194.238.3 with SMTP id vg3mr5041805wjc.69.1415893745400; Thu, 13 Nov 2014 07:49:05 -0800 (PST) Original-Received: by 10.27.215.135 with HTTP; Thu, 13 Nov 2014 07:49:05 -0800 (PST) In-Reply-To: <87zjbvt8o3.fsf@rosalinde.fritz.box> X-Google-Sender-Auth: gA_EPg7goN5-8k4rdMuP9GzttIc X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22a 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:176928 Archived-At: 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. If you want to keep your changes to apply later you can use git stash, or just commit them in the task branch before checking out other branches.