<<<<<<< message_headers.inc on my mailbox list with latest cvs

[Michael Bull]

At 02:47 PM 04/01/2001 -0500, you wrote:
>Quoting Michael Bull <mbull@uoguelph.ca>:
>
> > As per the above -- what different functions are required in PHP as
> > compared to 4.04-release, with the current IMP 2.3 cvs?
>
>I don't know that there are any changes in PHP that we rely on, but you need
>the latest PEAR.

Thanks for the info.
I've got the latest PEAR (to my knowledge) with PHP 4.04-stable.   With the 
latest horde/imp cvs,
I get the following showing up on my mailbox listing:

Delete | Undelete
<<<<<<< message_headers.inc


and in the header... in the column where subject would be just being 
labeled "==========", the size column having no info, and then the 
following in extra columns going off the pages:


<<<<<<< message_headers.inc >>>>>>> 2.32  =======  >>>>>>> 2.33 Subject

I'm going to try and track this down, but if anyone can think of a gotcha 
that might be involved... let me know.




>From chuck@horde.org Date: Thu,  4 Jan 2001 15:07:15 -0500
Return-Path: <chuck@horde.org>
Mailing-List: contact dev-help@lists.horde.org; run by ezmlm
Delivered-To: mailing list dev@lists.horde.org
Received: (qmail 36970 invoked from network); 4 Jan 2001 20:08:04 -0000
Received: from r93aag000369.sbo-smr.ma.cable.rcn.com (HELO marina.horde.org) (209.6.192.126)
  by horde.org with SMTP; 4 Jan 2001 20:08:04 -0000
Received: by marina.horde.org (Postfix, from userid 33)
	id DCA443974; Thu,  4 Jan 2001 15:07:15 -0500 (EST)
Received: from 206.243.191.252 ( [206.243.191.252])
	as user chuck@marina by marina.horde.org with HTTP;
	Thu,  4 Jan 2001 15:07:15 -0500
Message-ID: <978638835.3a54d7f3a1ed7@marina.horde.org>
Date: Thu,  4 Jan 2001 15:07:15 -0500
From: Chuck Hagenbuch <chuck@horde.org>
To: dev@lists.horde.org
References: <5.0.1.4.0.20010104141521.0353caf8@staff.mail.uoguelph.ca> <5.0.1.4.0.20010104141521.0353caf8@staff.mail.uoguelph.ca> <5.0.1.4.0.20010104145037.03571138@staff.mail.uoguelph.ca>
In-Reply-To: <5.0.1.4.0.20010104145037.03571138@staff.mail.uoguelph.ca>
MIME-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 8bit
User-Agent: Internet Messaging Program (IMP) 2.3.6-cvs
Subject: Re: [dev] <<<<<<< message_headers.inc on my mailbox list with latest cvs

Quoting Michael Bull <mbull@uoguelph.ca>:

> latest horde/imp cvs,
> I get the following showing up on my mailbox listing:
> 
> Delete | Undelete
> <<<<<<< message_headers.inc

Pay attention when you run cvs updates - those are caused by a cvs merge 
conflict. Not sure why you'd have a conflict, but unless you have local mods 
(which would be one reason to have a conflict) you should remove 
message_headers.inc and get a clean copy from cvs (cd imp/templates/mailbox; rm 
message_headers.inc; cvs update message_headers.inc).

-chuck

--
Charles Hagenbuch, <chuck@horde.org>
"If you can't stand the heat, get out of the chicken!" - Baby Blues