Malcolm,
On Mon, 8 Mar 2004, Malcolm J. Currie wrote:
> > You have CVS repositories for KAPPA, CONVERT, HDSTRACE and PAR, plus
>
> I can confirm that it's just these four.
Great.
> > 3. Apply that patch to the head of the new repository, bringing it to
> > the point that Alan left it, and commit that with a general `Alan
> > dun this' comment.
>
> Is there some quick fix using diff output to do this?
Given directories convert-old (your repository) and convert-current
(unpacked version of Alan's current distribution),
diff -Naur convert-old convert-current >convert-malcolm-alan.patch
creates a patch which can be applied to an old version of convert
(say, your repository version, as checked in to the cvs.starlink
repository) via
patch -Np1 <convert-malcolm-alan.patch
while in the directory which contains the repository/old version of
convert. That should bring the cvs.starlink repository version to the
point where it matches Alan's last release. I've made and distributed
patches like this before, successfully, but not often enough that I
remember how to do it without looking at the 'patch' manpage -- at the
bottom, it describes how best to use diff to make patches which are
suitable as input for 'patch'.
> > `Importing' CVS repositories is simple -- one just copies the CVS
> > repository from its source into the correct place under
> > cvs.starlink.ac.uk:/cvs.
>
> We'll see.
This is how I `imported' astrom and autoastrom from my repository to
cvs.starlink -- I tarred up the appropriate directory in the
repository on my machine, and untarred it on cvs.starlink.
Nervewracking, but surprisingly straightforward.
Norman
--
---------------------------------------------------------------------------
Norman Gray http://www.astro.gla.ac.uk/users/norman/
Physics and Astronomy, University of Glasgow, UK [log in to unmask]
|