From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: developing for guix with git Date: Thu, 28 Jan 2016 22:29:03 +0200 Message-ID: <20160128222903.51f615c0@debian-netbook> References: <87io2eszya.fsf@grrlz.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/QceW.g.y/SLkpQVds5.4TTQ"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtBt-0007wi-Cf for help-guix@gnu.org; Thu, 28 Jan 2016 15:29:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOtBo-00034o-E3 for help-guix@gnu.org; Thu, 28 Jan 2016 15:29:17 -0500 Received: from flashner.co.il ([178.62.234.194]:44145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtBo-00033u-36 for help-guix@gnu.org; Thu, 28 Jan 2016 15:29:12 -0500 In-Reply-To: <87io2eszya.fsf@grrlz.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org Sender: help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org To: Ni* Gillmann Cc: help-guix@gnu.org --Sig_/QceW.g.y/SLkpQVds5.4TTQ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, 28 Jan 2016 12:31:09 +0100 Ni* Gillmann wrote: > Following yesterdays "bug" I have a question which is only partly Guix > related and more development/git style related. >=20 > I am used to develop on things which I do not have to build and they > usually just work. Branching was never an issue. > However with guix it started to become one apparently, as I can build > the guix sourcetree from git clone with the master checkout but not > while being on the local branch I created to work on lispf4, which does > track the master. >=20 > I know it used to work, but this is strange for me. What are some ways, > other than directly working on master and rebasing often, people here do > interact with git while working on guix? In other words, how do you > locally handle guix development? I know you asked for ideas that didn't involve working against master and rebasing, but that's really pretty much what I do. I find something that I want to package or update and work on it. If it's good, then I run `git checkout -b $branch_name` and send the patches off to the mailing list. If = it doesn't work, then I branch it off anyway so I can come back to it later. Every couple of days I rebase all my branches against master, with the idea being if it doesn't fall too far behind then any issues shouldn't be too ha= rd to fix. Sometimes it doesn't work out well, from start to finish aria2 took me 3 months to figure out the issue with the tests. Or anything that touches python.scm or another high-volume file does sometimes end up with issues. I do also have my side repo for files/programs that either need more work or aren't going to make it in. This is pretty easy with `export GUIX_PACKAGE_PATH=3D~/workspace/my-guix/` in my .bashrc. Pastee has a python command-line uploader with no license, that doesn't go anywhere. Quassel wi= ll end up being 3 parts and it's not always easy working with our monolithic qt package. Once that's done I'll figure out where to put it. I've had a couple of times where I've combined two patches and had to figure out separating them again. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --Sig_/QceW.g.y/SLkpQVds5.4TTQ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJWqnoPAAoJEPTB05F+rO6Tt9EP/1m8ALSiXzOmskr9SznYspOH PNt9s9wlneKTbiAovyzys4cl/cbzpxuETdr5MFP914I/3u7PWHDsiKeLHLUNY5ei fJ9bTBXUDcy/1ITAqK/V+CKBestJzg0hXEje4tGeo+/Z1tvx1yby4MRlXs/QUiqN E11hOnfZ6fnDP35Q4Rpr+mQ2WpFSmtYK3w5dSxzO3/gC6amH2EQ8pCtXve1ChVR0 o8+W2qX2KL9ldU33NWxhoeKz21tySHmqjixJdCg9x49jJrU1awAq/Xr4q+vqSf6D Z5/hlRnF6D+X6J4/J81TiIRoEGN0JQ5NjAgHDCI/Wp1uUPc60H1o1SkstycyBzpo XNMa6MqS+lSleTveYID3DKOy/crk0XTt6Ee67HQ6ZkwbXQOggRTkgCetVZ/EwW0X N81b2Sbrft5qy8je3VjGsqvvTs/LoWHXi0LXDd9jWP9c6gmNDaqm0BGM9yR/eeNa PiIduutyKq/Z9VtykyJFwMufgwvirnbg0ovrU1S0lYa4fxXCq+uKVpw9yjZaOr4R gziQ07gJJyWfgLLt/xmk6sgiD3S6ivY299JO/Jkpdvn/7C3iun6yj5rwQLjWVO07 pv0Gd3cQ/CqUPcSfYky3Sz5BiAxqRisfcVJYAqHbGuleLE8rMK1WZpXe0KslRHe+ IVfbC49GZDbicpRrOanZ =9Kbm -----END PGP SIGNATURE----- --Sig_/QceW.g.y/SLkpQVds5.4TTQ--