Re: need help adjusting workflow to git (or vice versa)

[Kelvin White <kwhite@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 2165 bytes --]

On Nov 13, 2014 2:51 PM, "Stephen Berman" <stephen.berman@gmx.net> wrote:
>
> On Thu, 13 Nov 2014 10:49:05 -0500 Kelvin White <kwhite@gnu.org> wrote:
>
> > Stephen Berman <stephen.berman@gmx.net> 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.

Before checking out your build branch, either commit your changes, or stash
them. This will keep the changes in the build branch and not carry them
over into whatever branch you check out first.

[-- Attachment #2: Type: text/html, Size: 2771 bytes --]