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 15:53:24 -0500 Message-ID: References: <87zjbvt8o3.fsf@rosalinde.fritz.box> <87ppcqubfp.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=f46d0418258a0a2dcf0507c3b40f X-Trace: ger.gmane.org 1415912031 1251 80.91.229.3 (13 Nov 2014 20:53:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 20:53:51 +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 21:53:49 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 1Xp1Om-0002A3-VV for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 21:53:49 +0100 Original-Received: from localhost ([::1]:33843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp1Om-0006OX-Mr for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 15:53:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp1OV-0006OS-D5 for emacs-devel@gnu.org; Thu, 13 Nov 2014 15:53:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp1OP-00053i-BH for emacs-devel@gnu.org; Thu, 13 Nov 2014 15:53:31 -0500 Original-Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:50735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp1OP-00053d-09 for emacs-devel@gnu.org; Thu, 13 Nov 2014 15:53:25 -0500 Original-Received: by mail-wi0-f176.google.com with SMTP id ex7so802725wid.9 for ; Thu, 13 Nov 2014 12:53:24 -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=cpYow9ZxQHeDBQjK9d8qdpq0BNNCcwBvenN76JafD18=; b=G5CBsSEEDes/hJNSg+sySVceScEczYh03V0pgKmQOi0GPZN80eu3o7K5b8eXgBszQT 2xrTwgzkYY1q6athJgEPcxvy9IARNzk5UJEUi+Y9PriTU6leZOuEVkgT7B7MntWo7Gqr /kzmqmzcwjMUDlWxHvfxQ5j7mjmWSb4AHdz/VScyELCUFTr6+MR5Szt8CVIDGmT5gHsN 6+jR3Xq/5TbMF1t3T9qPOTf6vtdLYcBMw3tuqdddBS1rRZeYInbQkdGDLFHNoxxLjVtl TU41FMCHL/OYV26rNch8Ae5BI7iR7E7y6UL/xzcGlbwQ5Hidy0Sk3haGX7oRNsY8Y0+P Oq/g== X-Received: by 10.180.99.1 with SMTP id em1mr1572960wib.29.1415912004134; Thu, 13 Nov 2014 12:53:24 -0800 (PST) Original-Received: by 10.27.215.135 with HTTP; Thu, 13 Nov 2014 12:53:24 -0800 (PST) Original-Received: by 10.27.215.135 with HTTP; Thu, 13 Nov 2014 12:53:24 -0800 (PST) In-Reply-To: <87ppcqubfp.fsf@rosalinde.fritz.box> X-Google-Sender-Auth: RNhmXa7wjTy0HZOFqSlPVj3mc38 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 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:177006 Archived-At: --f46d0418258a0a2dcf0507c3b40f Content-Type: text/plain; charset=UTF-8 On Nov 13, 2014 2:51 PM, "Stephen Berman" wrote: > > 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. 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. --f46d0418258a0a2dcf0507c3b40f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


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 <step= hen.berman@gmx.net> wrote:
> >> I'm learning how to use git and am still stumbling over b= asic things.
> >> With bzr I had a shared repository of Emacs sources, containi= ng several
> >> branches, including a mirror of trunk that I only updated, an= d a branch
> >> that I did my regular builds from, which I pulled from the tr= unk mirror
> >> but occasionally made small changes to, which went into my bu= ilds.=C2=A0 I
> >> also had a task branch for longer term development, and occas= ionally
> >> copied or merged changes from there to the build branch.=C2= =A0 All of these
> >> branches had there own source files, which weren't touche= d by changes in
> >> the other branches (unless I merged or copied over changes).= =C2=A0 Now I've
> >> cloned the new git repository from Savannah and followed the<= br> > >> instructions on the Emacs Wiki to make a task branch.=C2=A0 B= ut there is
> >> still only one set of sources.=C2=A0 I do see the task branch= and can check
> >> it out, but when I added my changes from the corresponding bz= r task
> >> branch and then checked out master again, it shows the (still=
> >> uncommitted) changes.=C2=A0 I also made a build branch but wh= en 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.=C2=A0 So how c= an 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 current= ly
> checked out), and that's what I want to avoid.

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

--f46d0418258a0a2dcf0507c3b40f--