X-Authentication-Warning:	acp3bf.physik.rwth-aachen.de: broeker owned process doing -bs
Date:	Mon, 29 Jan 2001 13:50:21 +0100 (MET)
From:	Hans-Bernhard Broeker <broeker AT physik DOT rwth-aachen DOT de>
X-Sender:	broeker AT acp3bf
To:	djgpp-workers AT delorie DOT com
Subject:	Re: djasm patch
In-Reply-To:	<20010126121906.A9266@taniwha.org>
Message-ID:	<Pine.LNX.4.10.10101291347280.27309-100000@acp3bf>
MIME-Version:	1.0
Reply-To:	djgpp-workers AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	djgpp-workers AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

On Fri, 26 Jan 2001, Bill Currie wrote:

> On Fri, Jan 26, 2001 at 08:20:57PM +0200, Eli Zaretskii wrote:
> > Sorry, I'm not sure I understand what do you mean by ``backwards in
> > time'' here.
> 
> Jeff means that I didn't keep MY djasm.y up to date with the official version
> and thus many bug-fixes in djasm are not in my version. He thinks this is one
> of those (which you just proved).

Hmm.... looks like it's time for you or someone else to do a 'threeway'
diff or merge: your version, the current CVS version, and their common
ancestor. Then a longish session with Emacs' 'emerge' package (the
'merge-files-with-ancestor' function). The hard part would, of course, be
to determine what the latest common ancestor would be. Bill: do you have
any idea when you branched off your version?


Hans-Bernhard Broeker (broeker AT physik DOT rwth-aachen DOT de)
Even if all the snow were burnt, ashes would remain.

- Raw text -