Forum OpenACS Q&A: Re: cvs merge question

Collapse
2: Re: cvs merge question (response to 1)
Posted by Nis Jørgensen on
For why your file shows up in the Attic:

It doesn't exist on the main branch

For why it doesn't appear after the merge:

You forgot to update -d, and the www/global directory didn't exist/is empty on the trunk

References:

http://www.loria.fr/~molli/fom-serve/cache/101.html
http://www.loria.fr/~molli/fom-serve/cache/223.html