Re: Mismatching versions in Entries file

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel Franke <address@hidden> writes:

> L.S.,
> 
> I have a copied website tree on a server which was copied from an old
> server, all the files where checked out from CVS. The CVS root from
> which these files where checked out is gone and the files have been
> reimported into a new CVS tree but now the versions in the Entries
> file in the CVS directories are higher than the versions in the new
> CVS tree.

Unless all of the intermediate revisions were put into the 'new CVS
repository', you have nothing that will help you.

> Is there a way to resynchronize the Entries files so that cvs up will
> work again? I've already thought about rechecking out the tree but
> this isn't an option for the developer.

If you know that the checked out website files were the latest revision
of files in the repository, then you could checkout a separate tree with
whatever is at the top-of-tree for the new repository and then replace
those files with a copy of the website files and 'cvs commit' them to the
new repository and work forward from there.

If they were not the latest, then you might wish to create a branch to
put the website files into the repository. Either a new vendor branch or
just a branch of the top-of-tree and then replace all of the files from
the checked out tree with the website files.

In any case, there is no way to easily map the files into a separate
repository which is what you really have on your hands now.

Actually, I suppose it might be possible to take SHA1 hashes of the
website files an compare them with the SHA1 hashes of every revision in
the repository until you find a match for which revision in the
repository matches one of the website files. Then you could tag the
revision you found and generate diffs and merges later based on it.

        Good luck,
        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)

iD8DBQFGpifdCg7APGsDnFERApGAAJ9+A/q+za5O9Qv+/pBLekZtoq9JcgCgv7jQ
kxgILZ/wll8kzPREfX5sj6k=
=Fvnu
-----END PGP SIGNATURE-----