From xemacs-m  Sun Sep 14 03:02:55 1997
Received: from bittersweet.inetarena.com (karlheg@bittersweet.inetarena.com [206.129.216.38])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id DAA26899
	for <xemacs-beta@xemacs.org>; Sun, 14 Sep 1997 03:02:53 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.7/8.8.7/Debian/GNU) id BAA07440;
	Sun, 14 Sep 1997 01:02:49 -0700
To: XEmacs BETA <xemacs-beta@xemacs.org>
Subject: Re: [Success] XEmacs 20.3-beta20 "Tirana" on Linux-2.0.31pre9
References: <19970914102758P.furutaka@Flux.tokai.jaeri.go.jp> <m2hgboacbg.fsf@haruspex.demon.co.uk> <m267s4pg9x.fsf@altair.xemacs.org>
X-Face: /Q}=yl}1_v7nP)xXo5XjG8+tl@=uVu7o5u6)f]zN?+<hB!K.m9:[|*p34jVN`O;:XZXVSy>/\R>qDt(t8w!-i{(y0"`jFw^uk8inzO9wXabd'CdjUWfC\GHi:6nO*YC89#-qD>Q4r%9!V"<RYJ=7D#$";q=zML5'!=wvXk^$`6FT=5CMofQX)WUKt0p:OKl.mFOXx/D
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: text/plain; charset=US-ASCII
From: karlheg@inetarena.com (Karl M. Hegbloom)
Date: 14 Sep 1997 01:02:47 -0700
In-Reply-To: SL Baur's message of "13 Sep 1997 23:21:14 -0700"
Message-ID: <87hgbocogo.fsf@bittersweet.inetarena.com>
Lines: 52
X-Mailer: Gnus v5.4.64/XEmacs 20.3(beta19) - "Kyiv"

>>>>> "sb" == SL Baur <steve@xemacs.org> writes:

    sb> Oh.  If you are patching up, you need to do so from clean (==
    sb> identical to the previous release) source.

 I've been using CVS.  I keep a vendor tree, and a local branch, which
I have checked out.  I've got lots of disk space, (hard drives are
getting cheap.) so I keep the distribution untarred in a separate dir
and patch that.  (If I need the space I'll tar it up between
patchups.)  After the patch, I import it to the vendor branch, and
then do a `cvs update -d -ko -jXEmacs_20_Vendor:yesterday
                             -jXEmacs_20_Vendor:today xemacs-20'
...and run a `cvs status' in a shell buffer.  I then go through that
with `isearch', and look for "conflict", and fix all of the conflicts.
It takes about 15-30 minutes, getting easier with experience, before I
can configure and build.

    sb> It looks like you applied some of the patches posted on the
    sb> list and didn't back them out prior to patching up.

 No need to with cvs joins...  Just merge the `vendor' branch updates
into your local branch.

    sb> I know this is a pain; I'm not sure there is anything I can
    sb> really do about it.

 The cvs I just got from Debian GNU/Linux has some modifications from
the FreeBSD people in it.  I haven't even installed it yet, much less
looked it over.  The package's maintainer told me that the mods are
for making read-only net-accessable cvs repositories.

 There's been talk on the debian-devel mailing list about using cvs to
maintain packages...  with a vendor branch for the upstream source,
and a local branch tagged for each Debian package release.  There is a
set of scripts, `cvs-buildpackage'...? more... I've not read it yet,
sorry.  It can check out of cvs, and build a .deb package.

    sb> Speaking of clean source, has anyone dealt with brik?  I read
    sb> about it on the egcs list and it sounds like it might be a
    sb> good solution for providing an answer to how clean an applied
    sb> patch is.

 What is it?  "Where can I read about it?", asks Karl without even
trying YaHoo first.  I'll go do that now... [time passes]
I could not find it.  (how could I find it for myself?)


-- 
mailto:karlheg@inetarena.com (Karl M. Hegbloom)
http://www.inetarena.com/~karlheg
Portland, OR  USA
Debian GNU 1.3.1+hamm  Linux pre-2.0.31-9+select+QNX  AMD K5 PR-133

