From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.79.9 with SMTP id c9cs8841agb; Fri, 6 Nov 2009 23:09:47 -0800 (PST) Received: by 10.224.78.7 with SMTP id i7mr2878399qak.303.1257577786256; Fri, 06 Nov 2009 23:09:46 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 10si841176qyk.75.2009.11.06.23.09.46; Fri, 06 Nov 2009 23:09:46 -0800 (PST) Received-SPF: pass (google.com: domain of sup-talk-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-talk-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-talk-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id DB68F1D7886C; Sat, 7 Nov 2009 02:09:45 -0500 (EST) Received: from pion.club.cc.cmu.edu (PION.CLUB.CC.cmu.edu [128.237.157.88]) by rubyforge.org (Postfix) with ESMTP id AB6BF185826F for ; Sat, 7 Nov 2009 02:09:36 -0500 (EST) Received: from rlane by pion.club.cc.cmu.edu with local (Exim 4.69) (envelope-from ) id 1N6fQW-000560-AV; Sat, 07 Nov 2009 02:09:36 -0500 From: Rich Lane To: William Morgan In-reply-to: <1257509523-sup-3428@masanjin.net> References: <1256997213-sup-2725@masanjin.net> <80055d7c0911051838m855262bi93d149549de2da8c@mail.gmail.com> <1257476207-sup-3459@zyrg.net> <1257509523-sup-3428@masanjin.net> Date: Sat, 07 Nov 2009 02:09:36 -0500 Message-Id: <1257562722-sup-9854@zyrg.net> User-Agent: Sup/git Cc: sup-talk Subject: Re: [sup-talk] slowly catching up X-BeenThere: sup-talk@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: User & developer discussion of Sup List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-talk-bounces@rubyforge.org Errors-To: sup-talk-bounces@rubyforge.org 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