From: Martin Stromberg <eplmst AT lu DOT erisoft DOT se>
Message-Id: <200012051422.PAA11911@lws256.lu.erisoft.se>
Subject: Re: CVS question: Export option to preserve dates?
To: djgpp-workers AT delorie DOT com
Date: Tue, 5 Dec 2000 15:22:02 +0100 (MET)
In-Reply-To: <5.0.2.1.0.20001204194517.025a0b20@pop5.banet.net> from "Peter J. Farley III" at Dec 04, 2000 08:23:32 PM
X-Mailer: ELM [version 2.5 PL3]
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
X-MIME-Autoconverted: from 8bit to quoted-printable by albatross.wise.edt.ericsson.se id eB5EM3413658
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from quoted-printable to 8bit by delorie.com id JAA06583
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
Precedence: bulk

Peter said:
> At 09:44 PM 12/4/00 +0100, Tim Van Holder wrote:
>  >So you can just do the usual stuff (make, editing, etc). And 
> when >you're done, all you need to do is 'cvs diff' and voilą: instant 
> patch.
>  >djlsr203 shouldn't really come into it, unless you're trying to make 
> a
>  >2.03-to-CVS diff, in which case you're better off using 'cvs diff' 
> too;
>  >I expect there'll be a tag for the 2.03 release (checking... yup:
>  >v2_03)
> 
> Yes, but that assumes one *wants* to do online diffs.  I just want to 
> be able to do local diffs to a current base.  I don't really want to 
> re-connect to my ISP every time I need to make up a test diff.  And I 
> don't want to checkout the files, either, because I do not feel 
> competent enough at cvs to be *trusted* to check anything in.  I just 
> want to export them and generate local diffs, and then submit the patch 
> file to the djgpp-workers list for those who *can* be trusted to update 
> the real source.
> 
> And at dial-in speeds of only 50K bps or so, *nothing* I run online is 
> "instant".  More like, go brew a pot of coffee and maybe it will be 
> done when you get back.

I'm using a 28.8 modem and I think the cvs diffing is rather fast.

> Plus, not having the original dates means that I now I have to go back 
> and somehow patch my changes into the "updated" sources, instead of 
> just being able to diff the newer sources and my tested (on a base of 
> v2.03) changes, in order for a locally-run make to recognize *my* 
> changes to the files.

I'd do this:
diff -ruN /djgpp.203 /my_hacked_djgpp.203 > /my.diff
cd /my_cvs_root
cp -a src src.org
cp -a include include.org
patch -p<n> /my.diff
Clean up any rejections.
Verify the code works and is ok.
cvs diff -ruN .
Post the result.

Approximately, i. e.


Right,

						MartinS