Adriaan On Fri, Mar 27, 2009 at 11:02 PM, Adriaan de Groot <groot at kde.org> wrote: > On Wednesday 25 March 2009 17:14:41 Adriaan de Groot wrote: >> On Wednesday 25 March 2009 12:43:38 Lukas Oboril wrote: >> > should be fixed .... in both branches .... please, try it >> >> Why are there two branches again? > > Sorry, should have phrased that in a more friendly fashion. > > Remember back a month or so ago, we had two distinct branches -- default and > kde-4.1.4 -- and noticed that there was still way too much going on in the > dependencies. This meant doing a lot of transplants or duplicate work. So you > proposed to merge them again until such time as the deps were really stable > and it made more sense to branch off kde-4.1.4 again. > > So that's what we did. >
You're right,you merged default into kde-4.1.4 and we was commiting into kde-4.1.4 and default was inactive. > But the two branches still exist as named branches, so that might be > confusing. As long as noone touches the wrong (branch, we have a single line > of development again for the deps. > you was the first who is started posting into default again. I dont'understand why we are using 'branches' instead of 'tips'. Nobody knows about kde-4.1.4. Ben was commiting into default too. Conclusion: We have to merge both together once again, but in this way kde.4.1.4 > default. Remove or something like that kde-4.1.4, Continue work in default with KDE 4.1.4 and if it will be 'done' than we can use mark a 'TIP' as kde-4.1.4 > It can be really useful to add the following to your ~/.hgrc > > [extensions] > hgext.graphlog= > > this gives you the 'glog' command, as in 'hg glog --limit 10' and shows you an > ASCII-art graph of the repo's branching history. That can be useful in > figuring out where branches are coming from (or where they are going). > > I'll do it. I would like to arrange some disccussion about SCM system, because from my point of view, that's not a good state.I'd like too see in discussion these people: Stefan, Adriaan, Ben, Luc, Mark. Topic : How to do things in one SCM repository as simple as possible. Place: don't bother me ..... it might be : IRC. mail or else Have a nice weekend Luc > -- > Adriaan de Groot - KDE Quality Team, KDE-Solaris > ? ? ? ? ? ? ? ? - http://www.englishbreakfastnetwork.org/ > ? ? ? ? ? ? ? ? - http://solaris.kde.org/ > -- 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
