unofficial mirror of guile-devel@gnu.org 
 help / color / mirror / Atom feed
From: Marius Vollmer <mvo@zagadka.de>
Cc: Guile Development <guile-devel@gnu.org>
Subject: Re: Branch management
Date: 26 Mar 2006 01:09:46 +0200	[thread overview]
Message-ID: <87k6aiqfyd.fsf@minimini.mvo.home> (raw)
In-Reply-To: <87irqltfyq.fsf@ossau.uklinux.net>

Neil Jerram <neil@ossau.uklinux.net> 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


  parent reply	other threads:[~2006-03-25 23:09 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-11 10:48 Branch management Neil Jerram
2006-03-14  8:45 ` Ludovic Courtès
2006-03-14 19:06   ` Neil Jerram
2006-03-15  8:09     ` Ludovic Courtès
2006-03-15  8:18       ` Neil Jerram
2006-03-14 22:08 ` Kevin Ryde
2006-03-25 23:09 ` Marius Vollmer [this message]
2006-03-28  8:57   ` Ludovic Courtès
2006-04-17  0:37     ` Kevin Ryde
2006-04-18  8:11       ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/guile/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k6aiqfyd.fsf@minimini.mvo.home \
    --to=mvo@zagadka.de \
    --cc=guile-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).