KDE development with git

[Luciano Montanaro]

On mercoledì 11 luglio 2007, Tim Beaulen wrote:
> On 7/11/07, Paolo Capriotti <p.capriotti at gmail.com> wrote:
> > Git encourages a development model where many branches are created,
> > features are developed out of the main line, and then merged back to
> > the master branch. This is something which is hardly possible with svn
> > (and impossible, if one wants to keep some of the branches private),
> > but IMHO highly desirable for many KDE projects.
>
> And if I remember it correctly, this was one of the main reasons for
> the switch from cvs to svn.
>
> I don't understand the "hardly possible" bit as it is very easy to
> create branches and merge them back. In fact, this is done a lot in
> KDE.

Well, it's easy to create branches, as you say, but merging is more or less 
the same as in CVS, that is, quite painful, when you want to merge stuff 
more than once.

At least, until SVN gets the merge tracking feature (planned for SVN 1.5; 
how far will it be?).

Anyway, the switch to SVN has been an improvement over CVS, but has not been 
completely painless; switching to something else would need very good 
reasons, in my opinion (Sorry, Paolo!).

Luciano

-- 
./.. ../ /./. .. ./ /. ///   // /// /. / ./ /. ./ ./. /// ././. //
                                                            \\ //
                                             www.cirulla.net \x/