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.
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.
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).
--
Adriaan de Groot - KDE Quality Team, KDE-Solaris
- http://www.englishbreakfastnetwork.org/
- http://solaris.kde.org/
