From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: workflow Date: Thu, 4 Jan 2018 10:12:13 +0000 Message-ID: <20180104101213.d4gcgqihxu6d77eb@abyayala> References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="w35z3x5corv3xwdy" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX2Vo-0002qs-I3 for guix-devel@gnu.org; Thu, 04 Jan 2018 05:12:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX2Vj-0000R0-I3 for guix-devel@gnu.org; Thu, 04 Jan 2018 05:12:36 -0500 Received: from aibo.runbox.com ([91.220.196.211]:33590) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX2Vj-0000Oq-9g for guix-devel@gnu.org; Thu, 04 Jan 2018 05:12:31 -0500 Content-Disposition: inline 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: Catonano Cc: guix-devel --w35z3x5corv3xwdy Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Catonano transcribed 4.7K bytes: > 2018-01-04 10:37 GMT+01:00 Catonano : >=20 > > 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 bas= ed > > 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 direct= ory) > > > > 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 ? > > >=20 >=20 > 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) >=20 > Nothing unsurmountable, I was just curious if there's a best practice here Yeah, it can be confusing at first when someone is not used to .po files. You can stash those po/* files, it's the first thing I do if I ever happen to work on a complete new checkout. They are the translation files, pulled in by the bootstrap/configure proces= s of Guix. I would commit your changes to gnu/packages/python.scm and then simply run git stash If you'd ever want to get those files back (you don't really need to), you can take a look at the options of git stash or the general stash workflow. git stash apply would reapply those changes on top of you current HEAD. You could also drop the stashed changes, etc. --=20 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys WWW: https://n0.is/a/ :: https://ea.n0.is --w35z3x5corv3xwdy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlpN/f0ACgkQ4i+bv+40 hYh++A//eQhAeOpMoxMDP3S9+Xdipoj/BUJC4q/vECOH2y7vRzr+eVKSaEHyGfKL ZrJCD7ZCANHQWAffkatclj+UwH2zq+fMtbMUWyagp7AOKz5zw/OuqdXrCrxJg1gM tTxAE2omXrEYa7/jfRhkLoaBJ61yDCh6QoH+7hAdTWCbcMsYrIpH9sfA7exycTTi TvYwJnewgCcYPUFzUNxfqjWYvj8xAL2vb3qVxIY5aC5PgCyFYPocMmCIwVTM/8ab +r8YlMV9mS2OVCWTad/23RW8waNPDQ8wLD4Y5Y12xEe4rMVLuF/fcdMFILco15V8 4/KAYaIdq0fqspEBujNOiKZyoycZ7c821KraRu4PkMlDUHth8wM18ZwHIb6SrT/l XNuQ26VfxM2GN3uKUY7v67sjxPOLtj0AuJMrEBw/2nh48hSzbvWCFofn5rnvfx4m L0JVQG5McuTbD3Y2a6bx6NP3k8OqKVcy+8vpVG1lFDzvKBMZ3BgtmBfEec4hbXrB lZhnD9u0pQc6UBbMau9aKb1vwGTtN1TGTii06vHa36IDJmllZh9Z8zDxxoEDWxCT yjE72tvpeLZSYVqY+kVBny+UOAsHw5KZnNiq2EFFZ4CKl0K4qsywmMJpMCA97Fpb oQyZufut14gA8GavLmTPJPkey7rVTV8ACC2VRcli3WlmlU/z0z0= =BM55 -----END PGP SIGNATURE----- --w35z3x5corv3xwdy--