X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X-Injected-Via-Gmane: http://gmane.org/
To: geda-user AT delorie DOT com
From: Peter TB Brett <peter AT peter-b DOT co DOT uk>
Subject: Re: [geda-user] Thoughts on mechanical CAD interaction...
Date: Fri, 30 Aug 2013 06:38:07 +0100
Lines: 37
Message-ID: <87txi7zqkg.fsf@harrington.peter-b.co.uk>
References: <1377775142 DOT 15398 DOT 1 DOT camel AT pcjc2lap>
	<4F0C8F27-B063-44CF-9011-63D2B62F3FD9 AT jump-ing DOT de>
	<3752e7fd48358f6e97a09d34392997aa AT cam DOT ac DOT uk>
	<D5CCEA61-742E-4726-A779-9ADC45D580B4 AT jump-ing DOT de>
Mime-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
X-Complaints-To: usenet AT ger DOT gmane DOT org
X-Gmane-NNTP-Posting-Host: cpc4-oxfd23-2-0-cust628.4-3.cable.virginmedia.com
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
Cancel-Lock: sha1:rhOapdSGcIQCf4Jt/Dx9gjAZSqE=
Reply-To: geda-user AT delorie DOT com

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

Markus Hitter writes:

> Am 29.08.2013 um 20:57 schrieb Peter C.J. Clifton:
>
> Bug/feature branches in the official repo are rewritten often anyways,
> if just for rebasing them to follow other developments.
>

Well, they shouldn't be.  One of the things that (I thought) all of the
gEDA projects were pretty clear about, when we transitioned to git back
in 2007, was that the main repositories should provide reliable history.

If you want to mess around with rebasing, use a private repo.  In the
main gEDA repositories, merges should be used to show how other
developments are incorporated into branches.  Since git makes merges
*really easy* I don't feel like it's too much to ask.

                           Peter

=2D-=20
Dr Peter Brett <peter AT peter-b DOT co DOT uk>

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

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

iEYEARECAAYFAlIgL78ACgkQZ7Gbq7g7vpqt1QCfcYq+RBVnvvu5GQdGKQc/Pi8V
ooMAnAyzmItUtbWSTEH81aeD2yLNmM++
=vFdF
-----END PGP SIGNATURE-----
--=-=-=--