Re: XLogInsert scaling, revisited

Heikki Linnakangas <hlinnakangas@vmware.com>

View thread

From: Heikki Linnakangas <hlinnakangas@vmware.com>

To: Jeff Janes <jeff.janes@gmail.com>

Cc: Alvaro Herrera <alvherre@2ndquadrant.com>, PostgreSQL-development <pgsql-hackers@postgresql.org>

Date: 2013-06-19T06:28:33Z

Lists: pgsql-hackers

Attachments

xloginsert-scale-23.patch.gz (application/x-gzip) patch

On 18.06.2013 21:17, Jeff Janes wrote:
> Hi Heikki,
>
> I am getting conflicts applying version 22 of this patch to 9.4dev.  Could
> you rebase?

Here you go.

> Does anyone know of an easy way to apply an external patch through git, so
> I can get git-style merge conflict markers, rather than getting patch's
> reject file?

I've been wishing for that too. You can check out an older version of 
the branch, one that the patch applies cleanly to, and then merge 
forward. But that's cumbersome.

- Heikki