"Keith Wannamaker" <[EMAIL PROTECTED]> wrote:
> cvs 1.11; fresh checkout of apache-1.3 seems to almost finish, then dies with:
>
> cvs server: existing repository /home/cvs/apache-1.3/htdocs does not match
> /home
> /cvs/httpd-docs-1.3/htdocs
> cvs server: ignoring module htdocs-1.3
>
> Just a heads up, not urgent..
Keith, we're aware of the problem (it's a couple of weeks that we know it),
and it has also been recently reported to [EMAIL PROTECTED]
To check out the htdocs directory, this is what I do:
# cvs co apache-1.3
....
cvs server: existing repository /home/cvs/apache-1.3/htdocs does not match.
....
# rm -f apache-1.3/htdocs
# cvs co httpd-docs-1.3/htdocs
...
# mv httpd-docs-1.3/htdocs apache-1.3/htdocs
# rm -rf httpd-docs-1.3
# cd apache-1.3
# cvs update -APd
#
And you're set... You have the full working and up-to-date checkout.
To solve this problem the only solution would be to remove the "htdocs"
directory from the CVS repository on the server, but that would mean also
loosing the possibility to check out versions prior to 1.3.13.
If someone knows how to "merge" two CVS/RCS files preserving tags but
changing version numbers, that would be a solution.
Pier
"Rodent of Unusual Size" <[EMAIL PROTECTED]> wrote:
> -1 for 1.3. (Yes, that is a retroactive veto.) It breaks
> checkout as it currently stands (which could be fixed), and
> certainly violates the Principle of Least Astonishment for
> people upgrading from 1.3.20 or earlier.
Thanks for bringing this up to the list Ken... As things stand, it's
impossible to have a "clean" checkout of the FULL apache-1.3 CVS tree,
unless you don't manually remove the checked out htdocs directory, check it
out from the httpd-docs-1.3 module, move it in the right place, and do a
"cvs update -Pd"...
Also, with the current CVS layout, it's impossible to check out builds prior
to 1.3.13 (if I'm not wrong, but that should be the version).
Files should have been copied on the server around before the first split
(and I realize that now, months later it'll be a mess). If someone knows how
to "merge" two CVS (RCS) ",v" files, that could be a solution...
Pier
