| From: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
|---|---|
| To: | Bruce Momjian <maillist(at)candle(dot)pha(dot)pa(dot)us> |
| Cc: | Mark Hollomon <mhh(at)mindspring(dot)com>, pgsql-hackers(at)postgreSQL(dot)org |
| Subject: | Re: [HACKERS] oopsy in dynloader.c |
| Date: | 1999-07-23 13:42:40 |
| Message-ID: | 14299.932737360@sss.pgh.pa.us |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-hackers |
Bruce Momjian <maillist(at)candle(dot)pha(dot)pa(dot)us> writes:
> I can not find this problem in the current source tree. I believe you
> are seeing a merge problem with cvs. Remove the file and reupdate cvs.
In fact, that sort of breakage is exactly what cvs will do when it finds
a merge conflict (which it simple-mindedly defines as a local change that
falls in the same line range as a diff it's trying to apply from the cvs
master file). It will warn you that the merge failed --- so you should
always review the output from a cvs update run, looking for conflict
messages.
regards, tom lane
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Tom Lane | 1999-07-23 13:46:14 | Re: [HACKERS] Seg fault in initdb |
| Previous Message | Mark Hollomon | 1999-07-23 12:04:10 | Re: [HACKERS] oopsy in dynloader.c |