Re: cvs co apache-1.3

[Pier Fumagalli <pi...@apache.org>]

"Keith Wannamaker" <Ke...@Wannamaker.org> 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 dev@httpd.apache.org.

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

Re: cvs co apache-1.3

[Martin Kraemer <Ma...@Fujitsu-Siemens.com>]

On Sun, Sep 16, 2001 at 07:16:59PM +0100, Pier Fumagalli wrote:
> 
> 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
> # 

Or even simpler:

# echo >>~/.cvsrc update -Pd
# echo >>~/.cvsrc checkout -P
# cvs co apache-1.3
....
cvs server: existing repository /home/cvs/apache-1.3/htdocs does not match.
....
# cd apache-1.3
# rm -fr htdocs
# cvs co -d htdocs httpd-docs-1.3/htdocs

Not that it matters any longer, now that the Alias has been fixed.

   Martin
-- 
<Ma...@Fujitsu-Siemens.com>         |     Fujitsu Siemens
Fon: +49-89-636-46021, FAX: +49-89-636-47655 | 81730  Munich,  Germany