Re: [sup-talk] slowly catching up

From: Rich Lane <rlane@club.cc.cmu.edu>
To: William Morgan <wmorgan-sup@masanjin.net>
Cc: sup-talk <sup-talk@rubyforge.org>
Subject: Re: [sup-talk] slowly catching up
Date: Sat, 07 Nov 2009 02:09:36 -0500	[thread overview]
Message-ID: <1257562722-sup-9854@zyrg.net> (raw)
In-Reply-To: <1257509523-sup-3428@masanjin.net>

Excerpts from William Morgan's message of Fri Nov 06 08:47:51 -0500 2009:
> Reformatted excerpts from Rich Lane's message of 2009-11-05:
> > Rather than committing directly to mainline, I'd rather keep a public
> > repo that I apply incoming patches to and that William can pull from.
> > This way I could do a lot of the first-line work and he could get a
> > more stable flow of patches to make releases from.
> 
> That sounds good to me. I'm happy to add you to the gitorious repo, of
> course, but this is definitely more in line with the git lifestyle.
> 
> We have a couple options on how to organize this, but I think the best
> would be for you to maintain one or more branches that I treat as
> integration branches, and periodically merge into master whenever you
> tell me they're ready. That's a very minimal amount of work for me. I
> can just merge it and forget it.
> 
> The only things to be careful about in such a setup are not merging next
> into your branch (merging master in is fine and good to keep up with
> other stable changes), and not rebasing. And we will have to coordinate
> on releases, if nothing else so that I can make reasonable changelogs
> and release notes.
> 
> How does that sound?

Sounds good. I'll keep using my clone at http://github.com/rlane/sup/tree/master
unless people would prefer I move it to gitorious. 

When I see a new patchset I'll create a branch for it, like William has
been doing. One difference is that I'll hold off on merging to my master
(where new patches cook before being sent upstream) until I see some
positive feedback on the list. Initially this might just come from me,
but like I said before I'm hoping others will join in too. My intention
in creating the branch quickly after the patch is mailed is to make it
trivial for people tracking my repo to try out the newest patches.

As for getting changes to William, I'll occasionally (weekly?) apply the
patches I deem stable on top of his master branch and send mail to
the list. This way it should be a fast-forward when he pulls and we
won't have to worry about resolving merges differently.

As a side note, I just created a Wishlist wiki page for feature requests:
http://sup.rubyforge.org/wiki/wiki.pl?Wishlist
_______________________________________________
sup-talk mailing list
sup-talk@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-talk