From ooo-dev-return-1458-apmail-incubator-ooo-dev-archive=incubator.apache.org@incubator.apache.org Fri Jul 1 15:13:45 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 040EE42B5 for ; Fri, 1 Jul 2011 15:13:45 +0000 (UTC) Received: (qmail 94136 invoked by uid 500); 1 Jul 2011 15:13:44 -0000 Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org Received: (qmail 93956 invoked by uid 500); 1 Jul 2011 15:13:44 -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 93947 invoked by uid 99); 1 Jul 2011 15:13:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2011 15:13:43 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of marcus.mail@wtnet.de designates 213.209.103.13 as permitted sender) Received: from [213.209.103.13] (HELO smtp3.wtnet.de) (213.209.103.13) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2011 15:13:37 +0000 X-WT-Originating-IP: 84.46.106.252 Received: from f9.linux (pop8-761.catv.wtnet.de [84.46.106.252]) (authenticated bits=0) by smtp3.wtnet.de (8.14.4/8.14.4) with ESMTP id p61FDFfh017390 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO) for ; Fri, 1 Jul 2011 17:13:16 +0200 Message-ID: <4E0DE40B.2020206@wtnet.de> Date: Fri, 01 Jul 2011 17:13:15 +0200 From: "Marcus (OOo)" User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.9.2.18) Gecko/20110616 Thunderbird/3.1.11 MIME-Version: 1.0 To: ooo-dev@incubator.apache.org Subject: Re: Naming of trunk and feature branches References: <4E0B1601.9040605@wtnet.de> <4E0B298F.6010003@wtnet.de> <4E0DDDAA.2070400@wtnet.de> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Am 07/01/2011 04:56 PM, schrieb Alexandro Colorado: > On Fri, Jul 1, 2011 at 9:46 AM, Marcus (OOo) wrote: > >> Am 06/30/2011 04:03 AM, schrieb Alexandro Colorado: >> >> On Wed, Jun 29, 2011 at 8:33 AM, Marcus (OOo) >>> wrote: >>> >>> Sorry, it seems I wasn't clear enough. >>>> >>>> I don't think about how to name directories and files in the SVN repo >>>> itself. Sure we can stick with the schema like it is done in other >>>> projects. >>>> It's more a general thing how to present trunk and branches to the >>>> outside. >>>> >>>> E.g., when we release bits we have to make clear into which direction >>>> they >>>> point. It's a difference if we use a name like "branch 3.4.x" or tell the >>>> people it's "OOO 3.4.0" or maybe "AOOO 3.4.0". >>>> >>>> So, I don't think that a trailing 0 is not ? when it is the 3.4.0 >>>> release. >>>> And the OOO is still necessary to show it's from our project. Of course >>>> it >>>> could be "AOOO" or whatever we will agree to. >>>> >>>> How to name the release files is another thing. There should be a clear >>>> structure to keep it simple and straight for scripts. But this is a topic >>>> for later. >>>> >>>> I hope it's more clear now. ;-) >>>> >>> My bad also misconstruct the naming conversation. Well we used to have >>> different branches each with a name OOODEV was for the always development >>> branch and OOO for the actual release branches. >> >> I don't remember OOODEV as a name somewhere. >> >> So usually they got rid of the dots for clarity, and added a m for >>> milestone: >>> http://development.openoffice.org/releases/ >>> and DEV: >>> http://development.openoffice.org/releases/dev_index.html >> >> I'm sorry but I don't understand what you want to express with the both >> links. Please can you describe it in other words? > > I am pointing you to the naming of the branches and their dinamics. Isn't > that what you were addressing at first? Not sure what you mean by not Yes, that's right. > remembering OOODEV as a name, after you saw the link with the OOODEV branch. There is no OOODEV on the webpage. It's speaking about DEV and OOO milestones. Marcus >> Am 06/29/2011 03:03 PM, schrieb Greg Stein: >>>> >>>> On Wed, Jun 29, 2011 at 08:09, Marcus (OOo) >>>> wrote: >>>> >>>>> >>>>> With the discussions about the master and feature branches, the >>>>>> following >>>>>> question comes to my mind. >>>>>> >>>>>> What about this naming schema for master and feature branches? *) >>>>>> >>>>>> In the past we had the following: >>>>>> >>>>>> DEV300 = master/trunk/head >>>>>> This will never lead to a release >>>>>> >>>>>> >>>>> We're using Subversion, and nearly every svn repository across the >>>>> planet names this "trunk". Unless there is a specific reason to vary >>>>> from that, I don't see why we'd want to name the directory "DEV300". >>>>> >>>>> OOO340 = branch >>>>> >>>>>> Branched from a specific DEV300 milestone to stablize the code when >>>>>> coming >>>>>> closer to a specific release (here: OOo 3.4) >>>>>> >>>>>> >>>>> Branches can be named whatever we'd like. My own preference would be >>>>> to call this: /branches/3.4.x >>>>> >>>>> The "OOO" is awfully redundant, and the last digit ("0") doesn't make >>>>> sense since we would be releasing patches from the branch such as >>>>> 3.4.1. The "3.4.x" naming is used by many products, and it has worked >>>>> out very well.