Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of
 stephan.bergmann.secondary@googlemail.com designates 209.85.161.47 as
 permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=googlemail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        b=v4UL8/6yOcRSokwrgBWUMFwI4Wi7YFqHQu8aMRKPV+NUNagRORO1y0kfBkiQAPcnod
         ftYnVTcu/7BD9SD0ZnbQVIIUVqw5ww6LGvWO7zRzesbHHywsWP+6b1HObbUkzoYZCgLq
         qpDIqbhu5QURloZFB3LSM4UhaYHRKIDNVUEjM=
MIME-Version: 1.0
In-Reply-To: <4DFB138A.5080501@gmx.net>
References: <BANLkTin++dbGRmkjA5gm2G-oN-XTEb59+g@mail.gmail.com>
	<4DF7979E.4080106@gmx.net>
	<BANLkTinAshGUpUZmVN4x_K07shWfO7=WJg@mail.gmail.com>
	<4DF9E686.20209@gmx.net>
	<BANLkTimrAOhJTroMR=c2g-8CYXExQ4iS5w@mail.gmail.com>
	<4DFAFBDF.5050606@gmx.net>
	<BANLkTimEzWppD+s=JhokiWqPGd75aPATBQ@mail.gmail.com>
	<4DFB138A.5080501@gmx.net>
Date: Fri, 17 Jun 2011 11:26:25 +0200
Message-ID: <BANLkTimYb+34xw8UR5Xz8rucNOZo3hw6Rg@mail.gmail.com>
Subject: Re: Subversion history (was: Wiki, SVN, other resources)
From: Stephan Bergmann <stephan.bergmann.secondary@googlemail.com>
To: ooo-dev@incubator.apache.org
Content-Type: multipart/alternative; boundary=0015174760f2c5432304a5e4fa20

--0015174760f2c5432304a5e4fa20
Content-Type: text/plain; charset=UTF-8

On Fri, Jun 17, 2011 at 10:42 AM, Mathias Bauer <Mathias_Bauer@gmx.net>wrote:

> On 17.06.2011 10:01, Stephan Bergmann wrote:
>
>> The other way around, DEV300 (tip rev 6b24005a31b8) past DEV300_m103 (why
>
> was such an old version chosen, anyway?) contains changesets not in OOO340
>> (tip rev c904c1944462), but for new files, this appears to only amount to
>> three harmless ones:
>> offapi/com/sun/star/awt/grid/**SelectionEventType.idl
>> toolkit/qa/complex/toolkit/mak**efile.mk <http://makefile.mk>
>> toolkit/qa/unoapi/makefile.mk
>>
>
> That's interesting. AFAIR OOO340m0 was branched from DEV300m106 - I wonder
> why something was integrated into DEV300 past the branch-off date.


Sorry, my fault.  Those are apparently files that got *removed* with
changesets added to OOO340 after it was spawned off from DEV300_m106
(rev 38188af12de4).  The only two changesets added to DEV300 after spawning
off OOO340 (rev 5d377dd89e6b and 6b24005a31b8) are small masterfixes whose
content is apparently also applied to OOO340 (via independent changesets).

So, in short, current OOO340 tip rev c904c1944462 contains everything
available on DEV300 and thus represents the most recent status of the OOo
code base.

-Stephan

--0015174760f2c5432304a5e4fa20--