[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git? branch-2-2?

From: Eric Blake
Subject: Re: git? branch-2-2?
Date: Tue, 04 Mar 2008 20:23:01 -0700
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv: Gecko/20080213 Thunderbird/ Mnenhy/

Hash: SHA1

According to Ralf Wildenhues on 3/4/2008 1:56 PM:
| Hello libtoolers,
| 1) Can we move to use git now?

I sure hope so!  It appears to have worked out well for coreutils,
autoconf, automake, m4, and gnulib, which are all closely related projects.

| 2) Can we create a branch-2-2 and cherry-pick bugfixes from HEAD
| into it, aiming for a soonish 2.2.2 (let's say, in a few weeks;
| already a few important issues are known)?

Fine by me.

| 3) If yes and yes, do you agree with the proposed git policy:
| master should usually not contain merges except for merges from public
| topic branches, should we have such in the future.  Generally, master
| should be the first to receive a patch, and stable branches should
| cherry-pick from master.  In your local trees, you should rebase private
| topic branches against the upstream tree before inclusion.

FYI, this is the same policy on automake.  Coreutils, autoconf, and gnulib
don't really have stable branches at the moment, although that could
change.  M4 has a stable branch (for 1.4.x) and a development branch (the
eventual 2.0), but they have diverged so far (even before conversion to
git) that I have lately been doing the reverse (apply patches to the
branch, then cherry-pick into master).  But I can live with your proposed
policy for libtool, particularly since it means the master branch should
never have regressions merely because a patch was applied to the stable
branch and not ported forward.

| I'm a bit unsure whether 2.2.2 should come before the move to git.
| Comments appreciated.

Once you have a git repository, you can use 'git cvsimport' incrementally
as long as we want to keep the CVS repository alive.  However, I found
with autoconf that the month that I was manually syncing CVS and git was a
bit awkward, and things went more smoothly once we committed to the master
savannah repository being git only.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at
Comment: Using GnuPG with Mozilla -


reply via email to

[Prev in Thread] Current Thread [Next in Thread]