X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.theimps.com
X-Spam-Level: 
X-Spam-Status: No, score=-100.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT
	shortcircuit=ham autolearn=disabled version=3.3.1
From: Peter TB Brett <peter AT peter-b DOT co DOT uk>
To: geda-user AT delorie DOT com
Subject: [geda-user] geda-gaf branches
Date: Tue, 20 Nov 2012 12:50:22 +0000
Message-ID: <874nkkxwtt.fsf@harrington.peter-b.co.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Reply-To: geda-user AT delorie DOT com

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable


Hi folks,

Levente has asked about branches in the geda-gaf git repository.

=2D Unstable development (the vast majority) takes place in the unstable
  'master' branch.  We make X.ODD.Y releases from 'master'.

=2D Stable development takes place in the 'stable-X.EVEN' branches.  Once
  an X.EVEN.0 release has taken place, we cherry pick appropriate
  urgent/critical fixes from the 'master' branch to make X.EVEN.Y releases.

=2D Merging takes place *from* 'stable-X.EVEN' branches into 'master', and
  never the other way round.  I've just merged 'stable-1.8' back into
  'master' this morning, in fact.

Hope that clears things up.

                             Peter

=2D-=20
Peter Brett <peter AT peter-b DOT co DOT uk>
Remote Sensing Research Group
Surrey Space Centre

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEARECAAYFAlCrfI8ACgkQZ7Gbq7g7vppQKgCfcI3uZErt0dte/SdOnfDjK0mF
ZWMAn1cCdw3UWqo9oEycBDHREBbEei0x
=z2qK
-----END PGP SIGNATURE-----
--=-=-=--