From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Marius Vollmer Newsgroups: gmane.lisp.guile.devel Subject: Re: Branch management Date: 26 Mar 2006 01:09:46 +0200 Message-ID: <87k6aiqfyd.fsf@minimini.mvo.home> References: <87irqltfyq.fsf@ossau.uklinux.net> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1143498596 29611 80.91.229.2 (27 Mar 2006 22:29:56 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 27 Mar 2006 22:29:56 +0000 (UTC) Cc: Guile Development Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Tue Mar 28 00:29:55 2006 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FO0DT-0006Lv-PC for guile-devel@m.gmane.org; Tue, 28 Mar 2006 00:29:40 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FO0DT-0004MW-71 for guile-devel@m.gmane.org; Mon, 27 Mar 2006 17:29:39 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FNHtE-0006Se-Sa for guile-devel@gnu.org; Sat, 25 Mar 2006 18:09:48 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FNHtD-0006SS-Kq for guile-devel@gnu.org; Sat, 25 Mar 2006 18:09:47 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FNHtD-0006SP-FJ for guile-devel@gnu.org; Sat, 25 Mar 2006 18:09:47 -0500 Original-Received: from [213.243.153.37] (helo=smtp1.pp.htv.fi) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FNHuM-00014h-DR for guile-devel@gnu.org; Sat, 25 Mar 2006 18:10:58 -0500 Original-Received: from zagadka.ping.de (cs181072157.pp.htv.fi [82.181.72.157]) by smtp1.pp.htv.fi (Postfix) with SMTP id 7740E7FC32 for ; Sun, 26 Mar 2006 01:09:46 +0200 (EET) Original-Received: (qmail 15344 invoked by uid 1000); 26 Mar 2006 01:09:46 +0200 Original-To: Neil Jerram In-Reply-To: <87irqltfyq.fsf@ossau.uklinux.net> Original-Lines: 31 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.4 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:5812 Archived-At: Neil Jerram writes: > Just a heads-up: until I get to any work that isn't appropriate for > the 1.8 branch, I'm planning to make all my commits to the 1.8 branch > only, on the assumption that we will do something later to copy those > changes to CVS head. Yes, that's how it is going to happen. It wasn't really planned that way. We did it differently in 1.6 vs HEAD, where we applied patches to both branches simultaneously by hand, and we might switch to that mode once HEAD has suffifiently diverted from the 1.8 branch. > I also see a couple of problems with the CVS head branch as it stands. > > 1. Because it was forked before the 1.8 release, it doesn't contain > markers in the NEWS or ChangeLogs for when the release happened. > > 2. For the same reason, it doesn't have 2006 in its copyrights - which > makes it tedious to compare the 1.8 and head CVS trees. Yep, the merge from the 1.8 branch should fix this. > (To avoid these problems in future, I recommend branching only after > making a .0 release.) Yeah, it would have been OK to freeze HEAD until the release was made. -- GPG: D5D4E405 - 2F9B BCCC 8527 692A 04E3 331E FAF8 226A D5D4 E405 _______________________________________________ Guile-devel mailing list Guile-devel@gnu.org http://lists.gnu.org/mailman/listinfo/guile-devel