* [sup-devel] topic branch merge report
@ 2009-12-31 20:31 William Morgan
2009-12-31 21:31 ` Rich Lane
0 siblings, 1 reply; 3+ messages in thread
From: William Morgan @ 2009-12-31 20:31 UTC (permalink / raw)
To: sup-devel mailing list
Hi all,
I've merged the following branches down to master:
'thread-joining-fix', 'no-mailcap-on-darwin',
'label-list-mode-auto-update', 'interactive-crypto',
'label-list-mode-hooks', 'refine-inbox-mode', 'poll-unusual',
'attach-wildcards', 'order-names-by-date' and 'save-all-attachments'.
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!
--
William <wmorgan-sup@masanjin.net>
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [sup-devel] topic branch merge report
2009-12-31 20:31 [sup-devel] topic branch merge report William Morgan
@ 2009-12-31 21:31 ` Rich Lane
2009-12-31 22:41 ` William Morgan
0 siblings, 1 reply; 3+ messages in thread
From: Rich Lane @ 2009-12-31 21:31 UTC (permalink / raw)
To: William Morgan; +Cc: sup-devel mailing list
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [sup-devel] topic branch merge report
2009-12-31 21:31 ` Rich Lane
@ 2009-12-31 22:41 ` William Morgan
0 siblings, 0 replies; 3+ messages in thread
From: William Morgan @ 2009-12-31 22:41 UTC (permalink / raw)
To: sup-devel mailing list
Reformatted excerpts from Rich Lane's message of 2009-12-31:
> Done. Branch xapian-merged at git://github.com/rlane/sup
Thank you. Also merged into master.
--
William <wmorgan-sup@masanjin.net>
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-31 22:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-31 20:31 [sup-devel] topic branch merge report William Morgan
2009-12-31 21:31 ` Rich Lane
2009-12-31 22:41 ` William Morgan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox