[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: KDE development with git
From:       Thomas Zander <zander () kde ! org>
Date:       2007-07-13 7:57:10
Message-ID: 200707130957.10854.zander () kde ! org
[Download RAW message or body]


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 
of KOffice in a personal SRM[1] repo. Its really useful to do stuff on 
the move and the extra features compared to svn are just amazing for my 
productivity.

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

Bottom line for me is that having an official main repository is crucial, 
and that repository should have a 1-to-1 connection to the subversion 
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 
changes are moved back and forth; I personally don't see any need for 
this to go realtime and a daily (depending on the commit rate of your 
project) sync is all that's needed.
-- 
Thomas Zander

[Attachment #3 (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]