Robert Haas wrote:
> On Wed, Mar 4, 2015 at 2:27 PM, Alvaro Herrera <alvherre@2ndquadrant.com> wrote:
> > BTW one solution to the merge problem is to have unique separators for
> > each entry. For instance, instead of
> Speaking from entirely too much experience, that's not nearly enough.
> git only needs 3 lines of context to apply a hunk with no qualms at
> all, and it'll shade that to just 1 or 2 with little fanfare. If your
> pg_proc entries are each 20 lines long, this sort of thing will
> provide little protection.
Yeah, you're right. This is going to be a problem, and we need some
solution for it. I'm out of ideas, other than of course getting each
entry to be at most two lines long which nobody seems to like (for good
reasons.)
--
Álvaro Herrera http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
