From ooo-dev-return-443-apmail-incubator-ooo-dev-archive=incubator.apache.org@incubator.apache.org Fri Jun 17 10:49:38 2011 Return-Path: X-Original-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6222A468C for ; Fri, 17 Jun 2011 10:49:38 +0000 (UTC) Received: (qmail 37983 invoked by uid 500); 17 Jun 2011 10:49:38 -0000 Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org Received: (qmail 37943 invoked by uid 500); 17 Jun 2011 10:49:38 -0000 Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-dev@incubator.apache.org Received: (qmail 37935 invoked by uid 99); 17 Jun 2011 10:49:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jun 2011 10:49:38 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=RFC_ABUSE_POST,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [92.249.128.185] (HELO relay03.digicable.hu) (92.249.128.185) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jun 2011 10:49:33 +0000 Received: from [94.21.14.244] (helo=[192.168.0.101]) by relay03.digicable.hu with esmtpa id 1QXWbw-0006v3-24 for ; Fri, 17 Jun 2011 12:49:12 +0200 Message-ID: <4DFB311F.7030907@hdsnet.hu> Date: Fri, 17 Jun 2011 12:49:03 +0200 From: =?UTF-8?B?UmVpemluZ2VyIFpvbHTDoW4=?= User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; hu; rv:1.9.2.17) Gecko/20110414 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: ooo-dev@incubator.apache.org Subject: Re: Subversion history References: <4DF7979E.4080106@gmx.net> <4DF9E686.20209@gmx.net> <4DFAFBDF.5050606@gmx.net> <4DFB138A.5080501@gmx.net> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Original: 94.21.14.244 2011.06.17. 11:26 keltezéssel, Stephan Bergmann írta: > On Fri, Jun 17, 2011 at 10:42 AM, Mathias Bauerwrote: > >> 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 >>> 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. > May be not, some cws not integrated into DEV300m106 and OOO340 codline. I think one is the hsqldb19 which introduces HSQLDB 2.2.x into OOo which was not finished to OOo 3.4 split, and waited for integration to OOo 3.5. May be some bugfixes to database in cws fs34b and fs34c, I'm not sure, about their state in OOo340m1, because QA was finished later than OOo 3.4beta (OOO340m0). Zoltan