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 ... :) > Having two separate source code repositories, for any project, and with all > the administrative maintenance overhead of keeping them in sync is simply a > Bad Idea(TM). > Well, it is quite complicated at least. I'd like to have one repository. Could we reach an decision ? If you remember, one and half year back, I've started creating spec files (regular) in cvsdude under SPECS directory. They were original spec files, which were using your patches and original tarballs if it was possible. You and Ade have defeated me with Ade's format pspc and 'build infrastructures files' (january '08). I had started work on pspc files with you and Ade. I hadn't any problem with that. Sometimes in fall '08 Ade started hg repositories. I was a bit out of the first line, because I had some personal troubles. When I was back, these repos existed and seemed that main packaging traffic was there. I hadn't any question, because I hadn't much time and couldn't waste with small rest of my time with dumb questions. Ade's effort with hg repos is somwhere in the middle of way to regular spec files. I don't know if Ade had talked with someone from Sun, but it seems yes, because he wants to be a bit close to regular spec files (i.e as JDS project has). I would talk for Ade. Let's take a place for Ade. As you know. Regular spec files are very close to my idea. I think it doesn't matter if it will be in svn or hg, but we must be consistent. We need one world, one playground. I hope that I remember everything right, otherwise sorry for my dumb head :) Luc > --Stefan > > -- > Stefan Teleman > Sun Microsystems, Inc. > Stefan.Teleman at Sun.COM > > -- 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
