[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: makefile -f Makefile.cvs aborts with compile_kpilot does not
From:       Adriaan de Groot <adridg () sci ! kun ! nl>
Date:       2004-01-18 17:03:37
Message-ID: Pine.GSO.4.44.0401181756560.1336-100000 () wn4 ! sci ! kun ! nl
[Download RAW message or body]

On Sun, 18 Jan 2004, Unai Garro wrote:
> Somebody replied that a few devels did actually test HEAD instead of
> osnabrueck. And everybody seemed to agree that osnabrueck wasn't going to be
> out.

Here, let me draw you a diagram, which applies to the kde-pim module:

      HEAD (er, what was head every day)
       |
       |
       +----+ osnabrueck_branch
       |    |
       |    |
       |    |
       |
       +---------+ KDE_3_2_BRANCH (this is the stable, released stuff)
       |         |
       |    |
       +----+ merge
       |


So we're now left with two branches, just like every other KDE CVS module:
KDE_3_2_BRANCH, which is stable and releas(able), and HEAD. HEAD has just
gotten all the stuff from osnabrueck_branch dumped into it. It's a little
wonky right now.

In general, though, the new policies apply to kdepim HEAD - stability,
compatibility. (And I just saw your "ignore 0.02" message, but decided to
explain anyway).

Because of this somewhat convoluted setup, it's _really_ important to
explain what branch, updated when, you're trying to compile.

-- 
 Adriaan de Groot    adridg@cs.kun.nl     Kamer A6020     024-3652272
GPG Key Fingerprint 934E 31AA 80A7 723F 54F9  50ED 76AC EE01 FEA2 A3FE
               http://www.cs.kun.nl/~adridg/research/


[prev in list] [next in list] [prev in thread] [next in thread]