X-Authentication-Warning:	delorie.com: mail set sender to djgpp-bounces using -f
Message-ID:	<BAYC1-PASMTP04FED050291CC5C417D7B2EF800@CEZ.ICE>
X-Originating-IP:	[65.95.199.84]
X-Originating-Email:	[april_white AT sympatico DOT ca]
Message-ID:	<44946290.80405@sympatico.ca>
Date:	Sat, 17 Jun 2006 16:14:08 -0400
From:	April White <april_white AT sympatico DOT ca>
User-Agent:	Thunderbird 1.5.0.4 (Windows/20060516)
MIME-Version:	1.0
To:	djgpp <djgpp AT delorie DOT com>
Subject:	cvs failed to merge two files
X-OriginalArrivalTime:	17 Jun 2006 20:14:08.0555 (UTC) FILETIME=[9704D7B0:01C6924A]
Reply-To:	djgpp AT delorie DOT com

Last weekend I received some messages from cvs that some files could not 
be successfully merged, so I downloaded the source tree and overwrote my 
existing copy.

I was expecting to not have any problems today, however the files 
include\hbdefs.h and include\hbver.h again failed today.

In hbver.h, the $Id line was the first conflict, and the definition of 
HB_VER_REVISION was the other.
In hbdefs.h, only the $Id was in conflict.

I am going to alter the files by hand, the necessary changes are 
straight forward.  I am trying to understand why this occurred again, 
and if I did something wrong.

Any enlightenment is appreciated.

April

-- 
Press any key to continue or any other key to quit...

- Raw text -