X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:content-transfer-encoding; bh=eEVuUhaoVymJvCJNTNsSBAdR5II4C/8LP4j7uN1kJls=; b=r8UuB+Pl7zxH6ZbNzF3Kv+0CtlqoTfnOd4GPb4kDGPwKumsi6yXp2hakvs2TSKAovm E2jaO0TdqmcNZnqIIbEQ+UnNnGXNIF3dSjGdLtaoTrtBF/MD+b/8woCtDEApg0KLBFTI t0Ce7VvsiYQF6fGPwFxBsma9/4XEvflbcsb9SCJjbtQ6LuJgj1XAQYRWB+/LmIrL7VPY zDVHcsH2j8Jb4sveUHEjjO3UQOxiXZ4LvkDPltlMLLO9b5oxghfcBIm1a2GqV43aRbyr IMVMBhRI9PPV5U3IkSV41ClMbxtYNh5Vg1ED+tb1F3P4YSDdMWp6/djVomaFrvByGGBh CTFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:content-transfer-encoding; bh=eEVuUhaoVymJvCJNTNsSBAdR5II4C/8LP4j7uN1kJls=; b=tC2sirfW87BuibgNg2zGwKbW0ZvldiTDbGjdYFg3CshQ78vTbywK26k2HvrQJfVyVo fdznsEbyV2qdYkdpvo+90I75dCGkXJvQZHc0SsUaIg4ghdt6knUMNoVFaAqHfYaSMxe9 rsKY9BH0QqLQ+2rHrXNbkQQrPHVhZJYJMvQixuhLtMp/Ex6wONT/GF+ZyYyfabQ7yyYF B9rSLrMjQyMdtCiGfBWifHLvCL/+70r2EPv244SwCAoKsFgIeuKIxCYm+A6UTc7Kwm76 VaknQKzIc2jrU4gbBwnkIbcK/Pta5HvMpq0sLKjfIXhk0QyDHMnEBe3Zw9OvHCFwDXQX tqsQ== X-Gm-Message-State: AMke39mcpbWpxM9w9vQVvAq4TzpfZqfQLnA+G1YS07VV5A4JxQPy42O0NrrQG0lEa9ZS981NfKKkQZ5BkWfmjA== X-Received: by 10.107.59.147 with SMTP id i141mr11248376ioa.152.1487108739428; Tue, 14 Feb 2017 13:45:39 -0800 (PST) MIME-Version: 1.0 Sender: svenn DOT bjerkem AT gmail DOT com In-Reply-To: References: From: "Svenn Are Bjerkem (svenn DOT bjerkem AT googlemail DOT com) [via geda-user AT delorie DOT com]" Date: Tue, 14 Feb 2017 22:45:38 +0100 X-Google-Sender-Auth: 7M4MT8ATSE4oLBqdcYKMK7qSEZ0 Message-ID: Subject: Re: [geda-user] New gEDA/gaf features To: geda-user Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by delorie.com id v1ELjfPc025843 Reply-To: geda-user AT delorie DOT com Errors-To: nobody AT delorie DOT com X-Mailing-List: geda-user AT delorie DOT com X-Unsubscribes-To: listserv AT delorie DOT com Precedence: bulk On 14 February 2017 at 20:46, Stephan Böttcher wrote: > Roland Lutz writes: > >> as I pointed out in the the other thread[1], I just merged a few new >> features into gEDA/gaf master. In order to use them, you need to >> build the current development version of gEDA/gaf from the >> repository.[2] > > Maybe I am confused, please help me understand. > > When I pull and build git://git.geda-project.org/geda-gaf, I will now > get gschem and gnetlist from Roland, with the new xorn/python machinery > underneath? You will get gschem the way it is currently handled by Roland. > > When I pull from Vladimir's fork (where is that?) I will get something > where a lot of C has be reimplemented in scheme? git remote add vzh http://github.com/vzh/geda-gaf.git git fetch --all gitk --all > > I guess I will need on use my own fork for a while, which so far used to > be git://git.geda-project.org/geda-gaf master with this patch: > https://bugs.launchpad.net/geda/+bug/911440. I will need to find some > commit in master to use for this purpose. Good opportunity to learn some > more git. When you have both mainline (Roland) and vzh (Vladimir) in your local working git area, you can try to rebase your patch to either and see how far you get in time before the rebase need some help to get to the tip of each fork. > > Maybe, when there is a clear cut between projects, I may test out the > new stuff, but not anytime soon. the clear cut so far came on d9e2745fdb7214491c44abdd3dd86ff2a9ee937f when Vladimir removed xorn in his vzh branch on github. For quite some time there was no action in mainline (Roland), but now things are happening there too. > > This is all very sad. It is unfortunate that things happen in master. There should be more active use of feature branches in order to give people possibility to have a slight more stable master to use when building from source, and to test the features for possible unintended breakage. One way is to use git fetch and then gitk to inspect what has happened instead of diving heads-in with git pull And set a local tags on commits that happen to suit your needs. -- Svenn