Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id j0LDl8mL011029 for ; Fri, 21 Jan 2005 13:47:08 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 8B7EA5392F for ; Fri, 21 Jan 2005 13:47:35 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CrzHQ-0000ry-90 for migo@homemail.com; Fri, 21 Jan 2005 08:56:52 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1CrzGj-0000kA-I5 for gnu-arch-users@gnu.org; Fri, 21 Jan 2005 08:56:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1CrzGg-0000i3-Dd for gnu-arch-users@gnu.org; Fri, 21 Jan 2005 08:56:06 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CrzGg-0000i0-9j for gnu-arch-users@gnu.org; Fri, 21 Jan 2005 08:56:06 -0500 Received: from [195.27.129.236] (helo=mailsc1.simcon-mt.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1Crz0k-00036X-6z for gnu-arch-users@gnu.org; Fri, 21 Jan 2005 08:39:38 -0500 Received: from localhost (localhost [127.0.0.1]) by mailsc1.simcon-mt.com (Postfix) with ESMTP id B5C7C3247F; Fri, 21 Jan 2005 14:39:36 +0100 (CET) Received: from localhost (localhost.local [127.0.0.1]) by gate.local (Postfix) with ESMTP id 3FC6C103D7; Fri, 21 Jan 2005 14:39:35 +0100 (CET) Received: by vandal.local (Postfix, from userid 1001) id 7F50BAEFF7; Fri, 21 Jan 2005 14:37:40 +0100 (CET) Date: Fri, 21 Jan 2005 14:37:40 +0100 From: "Andrei A. Voropaev" To: Harald Meland Subject: Re: [Gnu-arch-users] strategy to handle back-fixies Message-ID: <20050121133740.GG19548@vandal.simcon-mt.de> Mail-Followup-To: Harald Meland , gnu-arch-users@gnu.org References: <20050120090735.GA18766@vandal.simcon-mt.de> <20050120200644.GA7715@vagabond> <20050121082757.GA19548@vandal.simcon-mt.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new at local gate Cc: gnu-arch-users@gnu.org X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 2612 Lines: 63 On Fri, Jan 21, 2005 at 01:23:22PM +0100, Harald Meland wrote: > [Andrei A. Voropaev] > > > In fact I was (and still am) wondering how in practice this shall > > work. So far no documentation mentions this approach. So below are > > my guesses how it should work. Please correct me if I'm > > wrong. > > I don't think you're *wrong*, but the solution you propose below is > slightly diffuse on some points. > > > Suppose I have project foo and it is in > > archive/foo--mainline--1.0. So I 'get' this project > > You don't mention what the intention for this branch is. > > Is it to be used for "development of the project until version 1.0 is > ready to be released", or "bugfixes to the project after its 1.0 > release", or maybe both (a la CVS HEAD)? Personally, I tend to think > of "mainline" branches as having the former semantic, but YMMV. > > In any case, it is useful to formulate (at least to yourself) a > distinct intention for each branch you create. Hm. I have to admit you lost me here. Which just shows that I don't have clear understanding of branches/revisions naming. Now, with your questions in mind I'll try to replay my scenario. I have source code for project foo-1.0 that I have to maintain from now on. So I do "initial import" and name it 'foo--developtment--1.1', to show that I'm heading toward release 1.1. After adding few patches I do that release. Now I do tla tag foo--development--1.2 to continue with developing on 1.2. Now, my boss tells me that we should release 1.1.1 with some important bug fixes. How should I proceed in this case? Shall I do tla tag foo--development--1.1.1? I'm trying to figure out how to work with tla to be really productive. All I really need is a) Clearly know which sources where used for which realease b) What changes were done for each of the releases. The scenario above seemingly provide me with what I want. getting the latest from foo--development--1.1 gives me the sources used for release. And changelog for that branch tells me what changes were done. They also tell me which base release was used to create the release. This implies that after the release is done I stop commiting to the branch. The best would be to "lock" this branch somehow, so that nobody else by mistake would commit to it. Am I closer now to "proper" handling of "my" situation? -- Minds, like parachutes, function best when open _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/