Tim,
On Monday, March 8, 2004, at 06:48 PM, Tim Jenness wrote:
>> patch -Np1 <convert-malcolm-alan.patch
>>
>
> I think I must be missing the point here. Surely, you just copy the
> files
> over the top of your old CVS checkout tree and then just commit the
> changes directly to CVS? That's what CVS does (ie generate the diff for
> you). This is what I did when I committed Alan's SPECX patches (the
> linux
> port) to my specx cvs repository.
Ummmm. I think you're right, and I'm overcomplicating this. Malcolm
could just put his CVS tree in cvs.starlink:/cvs, and that instantly
becomes part of the Starlink repository, complete with all its history.
Then, as you point out, he simply has to update it with Alan's later
work.
That might be more fun with KAPPA than with CONVERT, of course.
> [you just have to be careful to cvs
> remove files that are no longer used]
This is sort-of what I had in mind. Generating patches does the work
of removing old files. But so what: there won't be many files removed,
they'd be reasonably easy to spot if you're looking out for that sort
of thing, and if you miss one it's no big deal.
Ignore me.
Norman
--
----------------------------------------------------------------------
Norman Gray http://www.astro.gla.ac.uk/users/norman/
Physics and Astronomy, University of Glasgow [log in to unmask]
|