From kde-core-devel  Fri Jul 13 07:57:10 2007
From: Thomas Zander <zander () kde ! org>
Date: Fri, 13 Jul 2007 07:57:10 +0000
To: kde-core-devel
Subject: Re: KDE development with git
Message-Id: <200707130957.10854.zander () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=118431349114406
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--nextPart1216969.5SlbJmOvEu"

--nextPart1216969.5SlbJmOvEu
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

On Wednesday 11 July 2007 15:05:43 Paolo Capriotti wrote:
> Using git-svn when the git repository is used by more than one
> developer is quite hard, and I could not manage to make it work
> properly (i.e. without adding extraneous 'merge' commits to svn), so
> I've decided to switch development completely to git

I also really like using a more powerful tool and regularly 'branch' parts=
=20
of KOffice in a personal SRM[1] repo. Its really useful to do stuff on=20
the move and the extra features compared to svn are just amazing for my=20
productivity.

At the end of the offline-time I just tend to merge things into subversion=
=20
as semi-big commits.  I'm positive that your perceived problem of "adding=20
extraneous 'merge' commits to svn" is not that much of a problem at all;=20
its what people used to svn see often when a svn-branch is merged into=20
mainline as well.

Bottom line for me is that having an official main repository is crucial,=20
and that repository should have a 1-to-1 connection to the subversion=20
repo[2], as others on this thread have explained.
If you get to make this work; please do blog about it and tell us how :)


Cheers!

1) http://www.kdedevelopers.org/node/2024
2) one-to-one means all the sources from one are visible in the other, and=
=20
changes are moved back and forth; I personally don't see any need for=20
this to go realtime and a daily (depending on the commit rate of your=20
project) sync is all that's needed.
=2D-=20
Thomas Zander

--nextPart1216969.5SlbJmOvEu
Content-Type: application/pgp-signature

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

iD8DBQBGlzBWCojCW6H2z/QRAqMCAJ9OR0VBLmYIjoyEcWylYMPnZ9KISwCgtDAA
tc7ABNKvWisVHqqDz2e2tR8=
=2ZD/
-----END PGP SIGNATURE-----

--nextPart1216969.5SlbJmOvEu--