From mboxrd@z Thu Jan 1 00:00:00 1970 From: Catonano Subject: Re: workflow Date: Thu, 4 Jan 2018 10:46:16 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="f403045d0e080605710561f034ae" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX26M-00040Q-Fn for guix-devel@gnu.org; Thu, 04 Jan 2018 04:46:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX26L-0004MS-G3 for guix-devel@gnu.org; Thu, 04 Jan 2018 04:46:18 -0500 Received: from mail-yw0-x22b.google.com ([2607:f8b0:4002:c05::22b]:32803) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX26L-0004M1-AO for guix-devel@gnu.org; Thu, 04 Jan 2018 04:46:17 -0500 Received: by mail-yw0-x22b.google.com with SMTP id k80so383067ywe.0 for ; Thu, 04 Jan 2018 01:46:17 -0800 (PST) In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel --f403045d0e080605710561f034ae Content-Type: text/plain; charset="UTF-8" 2018-01-04 10:37 GMT+01:00 Catonano : > I am trying to use git worktree, as suggested > > I'm tying to update python-magic from 0.4.3 to 0.4.15 in a worktree based > branch > > The new version builds fine > > But in preparing the commit, I find a lot of files that I didn't touch to > be changed > > $ git status > Sul branch update-tryton > Changes not staged for commit: > (use "git add ..." to update what will be committed) > (use "git checkout -- ..." to discard changes in working directory) > > modified: gnu/packages/python.scm > modified: po/guix/cs.po > modified: po/guix/da.po > modified: po/guix/de.po > modified: po/guix/eo.po > modified: po/guix/fr.po > modified: po/guix/hu.po > modified: po/guix/pl.po > modified: po/guix/pt_BR.po > modified: po/guix/sr.po > modified: po/guix/vi.po > modified: po/guix/zh_CN.po > modified: po/packages/da.po > modified: po/packages/de.po > modified: po/packages/eo.po > modified: po/packages/fr.po > modified: po/packages/hu.po > modified: po/packages/pl.po > modified: po/packages/pt_BR.po > modified: po/packages/sr.po > modified: po/packages/vi.po > > I only edited the first one, gnu/packages/python.scm > > I didn't remember this to happen before testing git worktree > Right ? > > What are these po/* files ? > This is a little bit annoying, as I can't rebase my branch on master in order to edit the commit message without dealing with those too (stashing or checking them out back to where they were) Nothing unsurmountable, I was just curious if there's a best practice here --f403045d0e080605710561f034ae Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
2018-01-04 10:37 GMT+01:00 Catonano <= catonano@gmail.com<= /a>>:
I am trying to use git worktree, as suggested

I'm ty= ing to update python-magic from 0.4.3 to 0.4.15 in a worktree based branch<= br>
The new version builds fine

But in preparing the = commit, I find a lot of files that I didn't touch to be changed

= $ git status
Sul branch update-tryton
Changes not staged for commit:<= br>=C2=A0 (use "git add <file>..." to update what will be c= ommitted)
=C2=A0 (use "git checkout -- <file>..." to dis= card changes in working directory)

=C2=A0=C2=A0=C2=A0 modified:=C2= =A0=C2=A0 gnu/packages/python.scm
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2= =A0 po/guix/cs.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/guix/da.po=
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/guix/de.po
=C2=A0=C2=A0= =C2=A0 modified:=C2=A0=C2=A0 po/guix/eo.po
=C2=A0=C2=A0=C2=A0 modified:= =C2=A0=C2=A0 po/guix/fr.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/g= uix/hu.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/guix/pl.po
=C2= =A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/guix/pt_BR.po
=C2=A0=C2=A0=C2= =A0 modified:=C2=A0=C2=A0 po/guix/sr.po
=C2=A0=C2=A0=C2=A0 modified:=C2= =A0=C2=A0 po/guix/vi.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/guix= /zh_CN.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/packages/da.po
= =C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/packages/de.po
=C2=A0=C2=A0= =C2=A0 modified:=C2=A0=C2=A0 po/packages/eo.po
=C2=A0=C2=A0=C2=A0 modifi= ed:=C2=A0=C2=A0 po/packages/fr.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2= =A0 po/packages/hu.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/packag= es/pl.po
=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/packages/pt_BR.po=C2=A0=C2=A0=C2=A0 modified:=C2=A0=C2=A0 po/packages/sr.po
=C2=A0=C2= =A0=C2=A0 modified:=C2=A0=C2=A0 po/packages/vi.po

I only edite= d the first one, gnu/packages/python.scm

I didn't remember= this to happen before testing git worktree
Right ?

W= hat are these po/* files ?


This is a littl= e bit annoying, as I can't rebase my branch on master in order to edit = the commit message without dealing with those too (stashing or checking the= m out back to where they were)

Noth= ing unsurmountable, I was just curious if there's a best practice here<= br>
--f403045d0e080605710561f034ae--