On Sun, Mar 8, 2015 at 12:35 PM, Andres Freund <and...@2ndquadrant.com> wrote: > On 2015-03-04 10:25:58 -0500, Robert Haas wrote: >> Another advantage of this is that it would probably make git less >> likely to fumble a rebase. If there are lots of places in the file >> where we have the same 10 lines in a row with occasional variations, >> rebasing a patch could easily pick the the wrong place to reapply the >> hunk. I would personally consider a substantial increase in the rate >> of such occurrences as being a cure far, far worse than the disease. >> If you keep the entry for each function on just a couple of lines the >> chances of this happening are greatly reduced, because you're much >> likely to get a false match to surrounding context. > > I'm not particularly worried about this. Especially with attribute > defaults it seems unlikely that you often have the same three > surrounding lines in both directions in a similar region of the file.
That's woefully optimistic, and you don't need to have 3 lines. 1 or 2 will do fine. > And even if it turns out to actually be bothersome, you can help > yourself by passing -U 5/setting diff.context = 5 or something like > that. I don't believe that for a minute. When you have your own private branch and you do 'git rebase master', how's that going to help? -- Robert Haas EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
