On Sat, Feb 21, 2009 at 10:20 PM, Stefan Teleman <Stefan.Teleman at sun.com> wrote: > - Show quoted text - > > Lukas Oboril wrote: >> >> On Sat, Feb 21, 2009 at 6:16 PM, Stefan Teleman <Stefan.Teleman at sun.com> >> wrote: >>> >>> Lukas Oboril wrote: >>>> >>>> Hi, >>>> >>>> proposal ... ?please be patient, I'm not SCM guru ;) >>>> >>>> >>>> We have two HG repos .... one is 'devel; and the second is 'stable' >>>> >>>> Now we are committing into 'devel' especially into kde-4.1.4 branch >>>> .... it is good ... but !!! I think some of those commits should go >>>> into default branch too, because they are touching FOSS* bits ... so >>>> my proposals in this point are ... >>>> >>>> 1. merge branches together, kde-4.1.4 will be master in that merge. >>>> 2. synchro 'devel' and 'stable' >>> >>> I'd like to Start From The Beginning(TM) and go from there. >>> >> >> It is possible each time ... >> >>> I still do not understand -- nor do I believe it has ever been clearly >>> explained, either in #kde-solaris, or on this mailing list -- why there >>> are, >>> at this point, two separate source code repositories for this project: >>> one >>> at CVSDude, and a semi-secret, second one in Mercurial. >>> >> >> These are not complete separate repositories, because you can't use hg >> without cvsdude sources. You need build infrastructure files (Solaris >> directory with patches) from cvsdude and in a few other cases you need >> complete source tree from cvsdude, if cvsdude source doesn't equal to >> pristine tarball. >> >> I thought that, you've reached an agreement with Adriaan when he >> started these two hg repositories. I wasn't the father of the idea >> therefore I'm not able to say more about startup. I know how it works >> only ... :) > > There never was an agreement to split the source code repositories for the > entire project, and to create two distinct, parallel repositories, with > different SCM systems. > > I had a brief private discussion with Ade about experimenting with > Mercurial, a couple of months ago. That's one thing. Splitting the SCM for > the entire project and creating two distinct repositories is another thing, > and I don't believe this type of decision could, or should be made in a very > brief and private IRC discussion. At least IMHO, this type of decision > should be made after an open discussion on this mailing list, because it > affects everyone involved with the project. > > Unless my recollections are failing me, I honestly don't remember having > this discussion on this mailing-list. >
Thanks for clarification > So, what we have now is: > > - CVSDude for some things source trees, patches and build scripts (configure.sh, build.sh, install.sh, patch.sh, apply_patches). only for FOSS > - Mercurial for some other things packaging effort ... spec files and KDE4 patches > - svn.kde.org as the authoritative master source repository for KDE4 > yes, it is complicated > The chain of SCM dependencies is: > > - Mercurial depends on CVSDude for some things it needs patches and build scripts from cvsdude > - Mercurial also depends on svn.kde.org for KDE4 not exactly, IMHO > - CVSDude depends on Mercurial (because changes made in Mercurial aren't > being sync'ed back to CVSDude). > cvsdude has not any working packaging stuff, that's true. Has not any KDE4 patches. Has complete FOSS stuff > I am trying very hard to understand the benefits of this SCM setup for our > project. I can't say I have reached that "AHA!" moment yet. I've experienced > quite a few "HMMMM..." moments, though. I don't see any. Ohhh wait .... I have one ... Mercurial is a bit suitable for me :) I think Mercurial as a program. I would like wait for Adriaan comments. Heads up !!! We will solve it !!! ;) Have a nice day > - Show quoted text - > > --Stefan > > -- > Stefan Teleman > Sun Microsystems, Inc. > Stefan.Teleman at Sun.COM > > luc -- Lukas 'Luc' Oboril IRC nickname: luc^ at freenode When dealing with people, let us remember we are not dealing with creatures of logic. We are dealing with creatures of emotions, creatures bristling with prejudices and motivated by pride and vanity. Dale Carnegie
