Niclas Hedhman wrote:

On Wednesday 24 September 2003 15:47, Stephen McConnell wrote:


Am trying to import the 4.1.5 docs for the avalon framework into
avalon-site/site/framework however I'm lots of conflicts (109 to be
exact).  Any suggests?

cvs import -I ! -I CVS -W "*.png -k 'b'" -W "*.gif -k 'b'" -m "no
message" avalon-site/site/framework MCCONNELL DOCS_4_1_5 (in directory
F:\dev\avalon\framework\site\target\docs\)



May I suggest;


1. check out the old avalon-site.
2. for FILE in `find . -type f | grep -v CVS` ; do rm $FILE ; done
3. copy the new docs into the old structure.
4. cvs -q remove  , to take away old docs no longer needed.
5. cvs -q update -dP , to get a list of new files.
6. cvs -q add <each such file>
7. cvs -q commit -m "whatever"


Umm, am I sufficiently brave ... ?
What about just nuking the contents of avalon-site/site/framework and doing a clean import?
My experience in the past is that I can (without problem) import over prior imports, but I cannot import over commits. Steve.


--

Stephen J. McConnell
mailto:[EMAIL PROTECTED]




--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to