Date: Wed, 27 May 2009 22:09:09 -0400
From: Aidan Van Dyk <aidan@highrise.ca>
To: Robert Haas <robertmhaas@gmail.com>
Cc: Heikki Linnakangas <heikki.linnakangas@enterprisedb.com>,
	Magnus Hagander <magnus@hagander.net>, Markus Wanner <markus@bluegap.ch>,
	Andrew Dunstan <andrew@dunslane.net>,
	PostgreSQL-development <pgsql-hackers@postgresql.org>
Subject: Re: PostgreSQL Developer meeting minutes up
Message-ID: <20090528020909.GQ15213@yugib.highrise.ca>
References: <4A1BABBC.7070803@hagander.net> <4A1BE039.70008@dunslane.net>
	<10273.1243343651@sss.pgh.pa.us> <4A1BFF70.4000506@dunslane.net>
	<20090526144812.GC15213@yugib.highrise.ca>
	<20090527121532.83276r2btyqp716s@mail.bluegap.ch>
	<4A1D1E64.6030908@hagander.net> <4A1D2290.7060907@enterprisedb.com>
	<20090527212240.GP15213@yugib.highrise.ca>
	<603c8f070905271829i9458bdftcaed2dadb0a74583@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="Pes7OZCOzfZhFQfq"
Content-Disposition: inline
In-Reply-To: <603c8f070905271829i9458bdftcaed2dadb0a74583@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)


--Pes7OZCOzfZhFQfq
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

* Robert Haas <robertmhaas@gmail.com> [090527 21:30]:

> > And actually looking at the history of the gpo repo, the branches are a=
ll
> > messed up with "merges" and stuff that I'm not sure where they are comi=
ng
> > from... =A08.2, 8.3, and master(HEAD) are all the same as my gpo repo, =
but the
> > back branchs are very bad...
>=20
> This is really quite horrible.  What is the best way forward here?

That depends entirely on what the project wants.

If you're just developing on HEAD with git to submit patches to official
CVS use, don't do anything...  HEAD is in good state in both repos.

If you're using git to rebase patches and changes between branches, in
order to submit patches for official CVS use, use the PostgreSQL.git I
publish on repo.or.cz.  It's back branches are in pretty good state too.

If the "project" wants to provide canonical "git" repository as a
cut-over from CVS, and CVS isn't going to be used anymore (other than
served as an anonymous "mirror" of the git repo by git cvsserver, or
have an old CVSROOT available as a public download for purely historical
inspection), then it's probably best to do a single CVS->git conversion
with one of the better tools (like parsecvs) that don't do incremental,
and publish a set of good "graft" point for those using gpo who want to
switch their current development onto the new git repo.

But, since git's a completely Dvcs at its core, and was built by people
thoroughly immersed in the tool-needs of vastly distributed VCS stuff,
no matter what the project deems the "official" git repository, people
will be able to continue to keep their current investment in git
development with stuff like grafts, filter-branch, rebase, etc.

a.

--=20
Aidan Van Dyk                                             Create like a god,
aidan@highrise.ca                                       command like a king,
http://www.highrise.ca/                                   work like a slave.

--Pes7OZCOzfZhFQfq
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

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

iD8DBQFKHfJFuVxNPsxNPScRAtujAJ43m62Xn03A+aDqAO2lDFueriQZ9wCePXXJ
TskZs2xAVr2/5ocUgaR8x3Q=
=MMOq
-----END PGP SIGNATURE-----

--Pes7OZCOzfZhFQfq--