Subject: [sup-talk] master branch merge report

From: [email-masked] (William Morgan)
Date: Tue, 08 Sep 2009 12:45:32 -0700

On preparation for an 0.9 release, I've merged the following branches
into master (in case anyone's keeping track!): console-mode,
reply-all-keybindings, restore-state, logging-tweaks,
enclosed-message-display-tweaks, hook-local-vars.

If anyone's running master, keep an eye out for changes and problems.
-- 
William <wmorgan-sup at masanjin.net>

---

From: [email-masked] (Nicolas Pouillard)
Date: Tue, 08 Sep 2009 21:51:56 +0200

> If anyone's running master, keep an eye out for changes and problems.

Thanks for these reports on the status of branches. They are really precious.
May ask for more? :) I would like you to also report on the status of what is
merged in next (or not yet merged in master).

-- 
Nicolas Pouillard
http://nicolaspouillard.fr

---

From: [email-masked] (William Morgan)
Date: Tue, 08 Sep 2009 13:05:14 -0700

Reformatted excerpts from Nicolas Pouillard's message of 2009-09-08:
> Thanks for these reports on the status of branches. They are really
> precious.  May ask for more? :) I would like you to also report on the
> status of what is merged in next (or not yet merged in master).

The only branches not merged into master at this point are
preemptive-loading and alignment-tweaks. This is based on a gut estimate
of whether they need to bake a little longer.

You can always get a complete report by using git wtf
(http://git-wt-commit.rubyforge.org/git-wtf). `git wtf -r -s master` and
`git wtf -r -s next` will show you what's merged into master and next
respectively.

I've also just merged custom-search-hook into master, with some effort.
-- 
William <wmorgan-sup at masanjin.net>

---

From: [email-masked] (Nicolas Pouillard)
Date: Tue, 08 Sep 2009 22:28:56 +0200

> of whether they need to bake a little longer.

OK nice.

> `git wtf -r -s next` will show you what's merged into master and next

I already use git-wtf (thanks for this tool BTW), with still some pain though.

These two commands outputs ~60 lines about dozen of branches. However that's
mainly due to the fact that I do have private branches.

It would be nice to simply ask differences between to branches in terms of
merged branches: git wtf mainline/master..mainline/next

> I've also just merged custom-search-hook into master, with some effort.

Thanks