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

Re: [sup-devel] topic branch merge report

To: William Morgan <wmorgan-sup@masanjin.net>
Subject: Re: [sup-devel] topic branch merge report
From: Rich Lane <rlane@club.cc.cmu.edu>
Date: Thu, 31 Dec 2009 16:31:18 -0500
Authentication-results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org
Cc: sup-devel mailing list <sup-devel@rubyforge.org>
Delivered-to: eg@gaute.vetsj.com
Delivered-to: sup-devel@rubyforge.org
In-reply-to: <1262291246-sup-2713@masanjin.net>
List-archive: <http://rubyforge.org/pipermail/sup-devel>
List-help: <mailto:sup-devel-request@rubyforge.org?subject=help>
List-id: Sup developer discussion <sup-devel.rubyforge.org>
List-post: <mailto:sup-devel@rubyforge.org>
List-subscribe: <http://rubyforge.org/mailman/listinfo/sup-devel>, <mailto:sup-devel-request@rubyforge.org?subject=subscribe>
List-unsubscribe: <http://rubyforge.org/mailman/options/sup-devel>, <mailto:sup-devel-request@rubyforge.org?subject=unsubscribe>
References: <1262291246-sup-2713@masanjin.net>
Reply-to: Sup developer discussion <sup-devel@rubyforge.org>
Sender: sup-devel-bounces@rubyforge.org
User-agent: Sup/git

Excerpts from William Morgan's message of Thu Dec 31 15:31:50 -0500 2009:
> Rich, I think I need your help with the two branches 'xapian-bugfix' and
> 'xapian-message-state', which are generating a conflict for some reason,
> and I don't understand the code well enough to resolve.  Would you be
> able to publish a branch ahead of master that has these two merged?
> Thanks!

Done. Branch xapian-merged at git://github.com/rlane/sup
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel

Follow-Ups:
- Re: [sup-devel] topic branch merge report
  - From: William Morgan <wmorgan-sup@masanjin.net>

References:
- [sup-devel] topic branch merge report
  - From: William Morgan <wmorgan-sup@masanjin.net>

Prev by Date: Re: [sup-devel] [PATCH] fixed am/pm in thread-list-mode for ruby1.8
Next by Date: Re: [sup-devel] [PATCH] fixed am/pm in thread-list-mode for ruby1.8
Previous by thread: [sup-devel] topic branch merge report
Next by thread: Re: [sup-devel] topic branch merge report
Index(es):
- Date
- Thread